PgBouncer: Use RuntimeDirectory (#506)

vitabaks · Nov 18, 2023 · c6c2f35 · c6c2f35
1 parent ccfb79a
commit c6c2f35
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/roles/pgbouncer/tasks/main.yml b/roles/pgbouncer/tasks/main.yml
@@ -34,6 +34,15 @@
     mode: "0750"
   tags: pgbouncer_conf, pgbouncer
 
+- name: Ensure log directory "{{ pgbouncer_log_dir }}" exist
+  ansible.builtin.file:
+    path: "{{ pgbouncer_log_dir }}"
+    state: directory
+    owner: postgres
+    group: postgres
+    mode: "0750"
+  tags: pgbouncer_conf, pgbouncer
+
 - name: Check if pgbouncer systemd service file exists
   ansible.builtin.stat:
     path: /etc/systemd/system/pgbouncer.service

diff --git a/roles/pgbouncer/templates/pgbouncer.service.j2 b/roles/pgbouncer/templates/pgbouncer.service.j2
@@ -8,9 +8,9 @@ Type=forking
 User=postgres
 Group=postgres
 
-PermissionsStartOnly=true
-ExecStartPre=-/bin/mkdir -p /run/pgbouncer /var/run/pgbouncer{{ '-%d' % (idx + 1) if idx > 0 else '' }} {{ pgbouncer_log_dir }}
-ExecStartPre=/bin/chown -R postgres:postgres /run/pgbouncer /var/run/pgbouncer{{ '-%d' % (idx + 1) if idx > 0 else '' }} {{ pgbouncer_log_dir }}
+RuntimeDirectory=pgbouncer{{ '-%d' % (idx + 1) if idx > 0 else '' }}
+RuntimeDirectoryMode=0755
+
 {% if ansible_os_family == "Debian" %}
 ExecStart=/usr/sbin/pgbouncer -d {{ pgbouncer_conf_dir }}/pgbouncer{{ '-%d' % (idx + 1) if idx > 0 else '' }}.ini
 {% endif %}