From f2bd125cfc4b7d985a4d3c933352fdc79275ddf6 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 9 Aug 2018 17:46:31 +0200
Subject: [PATCH] memcached: improve systemd units management

---
 memcached/README.md         |  3 +-
 memcached/defaults/main.yml |  2 +-
 memcached/tasks/main.yml    | 63 +++++++++++++------------------------
 3 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/memcached/README.md b/memcached/README.md
index a2039d57..a5f3e79e 100644
--- a/memcached/README.md
+++ b/memcached/README.md
@@ -25,5 +25,4 @@ When using memcached_instance_name variable, you can set up multiple memcached i
 
   roles:
    - { role: memcached, memcached_instance_name: "instance1" }
-   - { role: memcached, memcached_instance_name: "instance2" }
-
+   - { role: memcached, memcached_instance_name: "instance2", memcached_port: 11212 }
diff --git a/memcached/defaults/main.yml b/memcached/defaults/main.yml
index d7b1fc1d..a99f576a 100644
--- a/memcached/defaults/main.yml
+++ b/memcached/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-memcached_instance_name: False
+memcached_instance_name: ""
 memcached_logfile: '/var/log/memcached.log'
 memcached_mem: 64
 memcached_user: 'nobody'
diff --git a/memcached/tasks/main.yml b/memcached/tasks/main.yml
index 9e550336..0bf81713 100644
--- a/memcached/tasks/main.yml
+++ b/memcached/tasks/main.yml
@@ -3,7 +3,7 @@
     name: memcached
     state: present
   tags:
-  - memcached
+    - memcached
 
 - name: Memcached is configured.
   template:
@@ -12,8 +12,8 @@
     mode: "0644"
   notify: restart memcached
   tags:
-  - memcached
-  when: memcached_instance_name == False
+    - memcached
+  when: memcached_instance_name == ""
 
 - name: Memcached is running and enabled on boot.
   service:
@@ -21,41 +21,33 @@
     enabled: yes
     state: started
   tags:
-  - memcached
-  when: memcached_instance_name == False
+    - memcached
+  when: memcached_instance_name == ""
 
 - name: Add systemd template
   copy:
     src: memcached@.service
     dest: /etc/systemd/system/memcached@.service
   tags:
-  - memcached
-  when: memcached_instance_name != False
+    - memcached
+  when: memcached_instance_name != ""
 
 - name: Delete default memcached systemd configuration file
-  file:
-    path: /etc/systemd/system/multi-user.target.wants/memcached.service
-    state: absent
+  systemd:
+    name: memcached
+    enabled: false
+    state: stopped
   tags:
-  - memcached
-  when: memcached_instance_name != False
-
-- name: Create a symbolic link to memcached@.service
-  file:
-    src: /etc/systemd/system/memcached@.service
-    dest: /etc/systemd/system/multi-user.target.wants/memcached@{{ memcached_instance_name }}.service
-    state: link
-  tags:
-  - memcached
-  when: memcached_instance_name != False
+    - memcached
+  when: memcached_instance_name != ""
 
 - name: Make sure memcached.conf is absent
   file:
     path: /etc/memcached.conf
     state: absent
   tags:
-  - memcached
-  when: memcached_instance_name != False
+    - memcached
+  when: memcached_instance_name != ""
 
 - name: Create a configuration file
   template:
@@ -63,33 +55,20 @@
     dest: /etc/memcached_{{ memcached_instance_name }}.conf
     mode: "0644"
   tags:
-  - memcached
-  when: memcached_instance_name != False
-
-- name: Reload systemd configuration
-  sudo: yes
-  command: "systemctl daemon-reload"
-  tags:
-  - memcached
-  when: memcached_instance_name != False
-
-# Ansible 2.4 and above
-#- name: Reload systemd configuration
-#  systemd:
-#    daemon_reload: yes
-#  tags:
-#  - memcached
-#  when: memcached_instance_name != False
+    - memcached
+  when: memcached_instance_name != ""
 
 - name: Enable and start the memcached instance
   systemd:
     name: memcached@{{ memcached_instance_name }}
     enabled: yes
     state: started
+    daemon_reload: yes
     masked: no
   tags:
-  - memcached
-  when: memcached_instance_name != False
+    - memcached
+  when: memcached_instance_name != ""
 
 - include: munin.yml
+
 - include: nrpe.yml