sync roles with changes from OWS

roles/redis/defaults/main.yml

@@ -1,4 +1,5 @@
 ---
 
-# If port 0 is specified Redis will not listen on a TCP socket.
-redis_port: 0
+redis_port: 0  # If port 0 is specified Redis will not listen on a TCP socket.
+redis_unixsocket: "/var/run/redis/redis.sock"
+redis_unixsocketperm: 770

roles/redis/tasks/main.yml

@@ -4,11 +4,10 @@
     name: redis
     state: present
 
-- name: Copy redis config
-  template:
-    src: redis.conf.j2
-    dest: /etc/redis/redis.conf
-    owner: redis
-    group: redis
-    mode: "0640"
+- name: Configure redis
+  lineinfile:
+    path: /etc/redis/redis.conf
+    regexp: '^#?{{ item.option }} .*'
+    line: '{{ item.option }} {{ item.value }}'
+  loop: "{{ redis_options }}"
   notify: Restart redis

roles/redis/vars/main.yml

@@ -1,4 +1,6 @@
 ---
 
-redis_unixsocket: "/var/run/redis/redis.sock"
-redis_unixsocketperm: 770
+redis_options:
+  - {option: port, value: "{{ redis_port }}"}
+  - {option: unixsocket, value: "{{ redis_unixsocket }}"}
+  - {option: unixsocketperm, value: "{{ redis_unixsocketperm }}"}