Update main.yml

roles/sugarizer/tasks/main.yml

@@ -6,6 +6,7 @@
     warn: no
   when: sugarizer_version == "sugarizer-1.0"
 
+
 # 1. DOWNLOAD+LINK /opt/iiab/sugarizer
 
 - name: Clone llaske/sugarizer ({{ sugarizer_git_version }}) from GitHub to /opt/iiab (MAY DOWNLOAD 600+ MB)
@@ -23,6 +24,7 @@
     dest: "{{ sugarizer_location }}/sugarizer"
     state: link
 
+
 # 2. DOWNLOAD+LINK /opt/iiab/sugarizer-server
 
 # 2018-07-11: http://download.iiab.io/packages/sugarizer-server-1.0.tar.gz
@@ -55,6 +57,7 @@
     dest: "{{ sugarizer_location }}/sugarizer-server"
     state: link
 
+
 # 3. INSTALL A GOOD VERSION OF Node.js AND npm
 
 - name: Set up Node.js 8.x apt sources (debuntu, but avoid ubuntu-18)
@@ -98,6 +101,7 @@
     state: latest
   when: internet_available and (is_ubuntu_18 or not is_debuntu)
 
+
 # 4. RUN "npm install" TO POPULATE ~35MB /opt/iiab/sugarizer-server/node_modules
 
 # Re-running "npm install" USED TO fail on Raspbian 9 if not other OS's ?
@@ -170,9 +174,10 @@
     chdir: "{{ sugarizer_location }}/{{  sugarizer_server_version }}"
   when: internet_available
 
+
 # 5. PLACE CONFIG FILES
 
-- name: 'Install from templates: sugarizer.service (systemd), sugarizer.conf (Apache), sugarizer.ini and sugarizer-server'
+- name: "Install from templates: sugarizer.service (systemd), sugarizer.conf (Apache), sugarizer.ini and sugarizer-server"
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -185,15 +190,23 @@
     - { src: 'sugarizer.service.j2', dest: '/etc/systemd/system/sugarizer.service', mode: '0644' }
     - { src: 'sugarizer.js', dest: '/opt/iiab/sugarizer-server', mode: '0644' }
 
-- name: Create symlink for short URL http://box/sugarizer
+- name: Create symlink sugarizer.conf from sites-enabled to sites-available, for short URL http://box/sugarizer (debuntu)
   file:
     src: /etc/apache2/sites-available/sugarizer.conf
-    dest: /etc/apache2/sites-enabled/sugarizer.conf
+    path: /etc/apache2/sites-enabled/sugarizer.conf
     state: link
+  when: sugarizer_enabled and is_debuntu
+
+- name: Remove symlink /etc/apache2/sites-enabled/sugarizer.conf, if sugarizer_enabled: False" (debuntu)
+  file:
+    path: /etc/apache2/sites-enabled/sugarizer.conf
+    state: absent
+  when: not sugarizer_enabled and is_debuntu
+
 
 # 6. RESTART/STOP SYSTEMD SERVICE
 
-- name: Enable+restart systemd service if sugarizer_enabled, with "systemctl daemon-reload" (in case mongodb.service changed?)
+- name: Enable & Restart systemd service if sugarizer_enabled, with "systemctl daemon-reload" (in case mongodb.service changed?)
   systemd:
     name: sugarizer
     enabled: yes
@@ -201,19 +214,19 @@
     daemon_reload: yes
   when: sugarizer_enabled
   
-- name: Restart Apache so http://box/sugarizer works (not just http://box:8089)
-  systemd:
-    name: "{{ apache_service }}"    # httpd or apache2
-    state: restarted
-  when: sugarizer_enabled
-
-- name: 'Disable+stop systemd service if sugarizer_enabled: False'
+- name: "Disable systemd service, if sugarizer_enabled: False"
   systemd:
     name: sugarizer
     enabled: no
     state: stopped
   when: not sugarizer_enabled
 
+- name: Restart Apache ({{ apache_service }}) to enable/disable http://box/sugarizer (not just http://box:8089)
+  systemd:
+    name: "{{ apache_service }}"    # httpd or apache2
+    state: restarted
+  #when: sugarizer_enabled
+
 #- name: Enable services (all OS's)
 #  service:
 #    name: "{{ item.name }}"