Create piddirs with tmpfiles.d on systemd

Fixes DavidWittman#132

Author: DavidWittman

.gitignore

@@ -2,3 +2,4 @@
 .kitchen/
 .bundle
 .vagrant
+*.retry

tasks/sentinel.yml

@@ -34,6 +34,16 @@
         - ../templates
   when: redis_as_service and ansible_service_mgr|default() == 'systemd'
 
+- name: create systemd tmpfiles configuration
+  template:
+    src: etc/tmpfiles.d/redis.conf.j2
+    dest: /etc/tmpfiles.d/redis.conf
+    mode: 0644
+  when:
+    - redis_as_service
+    - ansible_service_mgr|default() == 'systemd'
+    - (redis_sentinel_pidfile|dirname).startswith('/var/run') or (redis_sentinel_pidfile|dirname).startswith('/run')
+
 - name: set sentinel to start at boot
   service:
     name: sentinel_{{ redis_sentinel_port }}

tasks/server.yml

@@ -19,7 +19,7 @@
       - default/redis.init.j2
       paths:
         - ../templates
-  when: redis_as_service and ansible_service_mgr | default != 'systemd'
+  when: redis_as_service and ansible_service_mgr|default() != 'systemd'
 
 - name: create redis systemd service
   template:
@@ -32,13 +32,23 @@
       - default/redis.service.j2
       paths:
         - ../templates
-  when: redis_as_service and ansible_service_mgr | default == 'systemd'
+  when: redis_as_service and ansible_service_mgr|default() == 'systemd'
+
+- name: create systemd tmpfiles configuration
+  template:
+    src: etc/tmpfiles.d/redis.conf.j2
+    dest: /etc/tmpfiles.d/redis.conf
+    mode: 0644
+  when:
+    - redis_as_service
+    - ansible_service_mgr|default() == 'systemd'
+    - (redis_pidfile|dirname).startswith('/var/run') or (redis_pidfile|dirname).startswith('/run')
 
 - name: set redis to start at boot
   service:
     name: "{{ redis_service_name }}"
     enabled: yes
-    daemon_reload: "{{ True if ansible_service_mgr | default == 'systemd' else omit }}"
+    daemon_reload: "{{ True if ansible_service_mgr|default() == 'systemd' else omit }}"
   when: redis_as_service
 
 # Check then create log dir to prevent aggressively overwriting permissions

templates/default/redis.service.j2

@@ -5,8 +5,6 @@ Documentation=http://redis.io/documentation, man:redis-server(1)
 
 [Service]
 Type={{ 'forking' if redis_daemonize == 'yes' else 'simple' }}
-ExecStartPre=-/bin/mkdir {{ redis_pidfile|dirname }}
-ExecStartPre=/bin/chown -R {{ redis_user }}:{{ redis_group }} {{ redis_pidfile|dirname }}
 ExecStart={{ redis_install_dir }}/bin/redis-server /etc/redis/{{ redis_port }}.conf
 EnvironmentFile=-/etc/default/redis_{{ redis_port }}
 PIDFile={{ redis_pidfile }}

templates/default/redis_sentinel.service.j2

@@ -5,8 +5,6 @@ Documentation=http://redis.io/documentation, man:redis-sentinel(1)
 
 [Service]
 Type={{ 'forking' if redis_daemonize == 'yes' else 'simple' }}
-ExecStartPre=-/bin/mkdir {{ redis_sentinel_pidfile|dirname }}
-ExecStartPre=/bin/chown -R {{ redis_user }}:{{ redis_group }} {{ redis_sentinel_pidfile|dirname }}
 ExecStart={{ redis_install_dir }}/bin/redis-server /etc/redis/sentinel_{{ redis_sentinel_port }}.conf --sentinel
 EnvironmentFile=-/etc/default/sentinel_{{ redis_sentinel_port }}
 PIDFile={{ redis_sentinel_pidfile }}

templates/etc/tmpfiles.d/redis.conf.j2

@@ -0,0 +1,4 @@
+d {{ redis_pidfile|dirname }} 0755 {{ redis_user }} {{ redis_group }}
+{% if redis_pidfile|dirname != redis_sentinel_pidfile|dirname -%}
+d {{ redis_sentinel_pidfile|dirname }} 0755 {{ redis_user }} {{ redis_group }}
+{% endif -%}