Merge pull request #113 from iiab/master

sync from iiab/iiab

roles/mongodb/tasks/main.yml

@@ -16,10 +16,10 @@
     owner: mongodb
   with_items:
     - { path: '/var/run/mongodb' }
-    - { path: "{{ mongodb_db_path }}" }
+    - { path: "{{ mongodb_db_path }}" }    # == /library/dbdata/mongodb/
     - { path: '/var/log/mongodb' }
 
-- name: Populate & position /etc/mongod.conf, /etc/systemd/system/mongodb.service
+- name: Populate & position /etc/mongod.conf, mongodb.service
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -27,27 +27,38 @@
     group: root
     mode: 0644
   with_items:
-    - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/mongodb.service' }
     - { src: 'mongod.conf.j2', dest: "{{ mongodb_conf }}" }
+    - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/mongodb.service' }
 
-- name: Restart service if enabled
+- name: Enable+restart systemd service if mongodb_enabled, with "systemctl daemon-reload" (in case mongodb.service changed?)
-  service:
+  systemd:
-    name: "{{ item.name }}"
+    name: mongodb
     enabled: yes
     state: restarted
-  with_items:
+    daemon_reload: yes
-    - { name: mongodb }
   when: mongodb_enabled
 
-- name: Stop service if not enabled
+- name: 'Disable+stop systemd service if mongodb_enabled: False'
-  service:
+  systemd:
-    name: "{{ item.name }}"
+    name: mongodb
     enabled: no
     state: stopped
-  with_items:
-    - { name: mongodb }
   when: not mongodb_enabled
 
+#- name: Restart service if enabled
+#  service:
+#    name: mongodb
+#    enabled: yes
+#    state: restarted
+#  when: mongodb_enabled
+
+#- name: Stop service if not enabled
+#  service:
+#    name: mongodb
+#    enabled: no
+#    state: stopped
+#  when: not mongodb_enabled
+
 - name: Add 'mongodb' to list of services at /etc/iiab/iiab.ini
   ini_file:
     dest: "{{ service_filelist }}"

roles/sugarizer/tasks/main.yml

@@ -182,23 +182,38 @@
 
 # 6. RESTART/STOP SYSTEMD SERVICE
 
-- name: Enable services (all OS's)
+- name: Enable+restart systemd service if sugarizer_enabled, with "systemctl daemon-reload" (in case mongodb.service changed?)
-  service:
+  systemd:
-    name: "{{ item.name }}"
+    name: sugarizer
     enabled: yes
     state: restarted
-  with_items:
+    daemon_reload: yes
-#   - { name: mongodb }    # 2018-07-14: NICE TRY, but still doesn't bring http://box:8089 to life reliably, as a reboot usually does!  (Is a "systemctl daemon-reload" or some such nec?)
-    - { name: sugarizer }
   when: sugarizer_enabled
 
-- name: Disable service (all OS's)
+- name: 'Disable+stop systemd service if sugarizer_enabled: False'
-  service:
+  systemd:
     name: sugarizer
     enabled: no
     state: stopped
   when: not sugarizer_enabled
 
+#- name: Enable services (all OS's)
+#  service:
+#    name: "{{ item.name }}"
+#    enabled: yes
+#    state: restarted
+#  with_items:
+##   - { name: mongodb }    # 2018-07-14: NICE TRY, but still doesn't bring http://box:8089 to life reliably, as a reboot usually does!  (Is a "systemctl daemon-reload" or some such nec?)
+#    - { name: sugarizer }
+#  when: sugarizer_enabled
+
+#- name: Disable service (all OS's)
+#  service:
+#    name: sugarizer
+#    enabled: no
+#    state: stopped
+#  when: not sugarizer_enabled
+
 - name: Add 'sugarizer' to list of services at /etc/iiab/iiab.ini
   ini_file:
     dest: "{{ service_filelist }}"