From d8ad6c8f70948746c09dd780082cdf585d617fec Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 29 Jan 2019 11:11:15 -0500
Subject: [PATCH] Update main.yml

---
 roles/sugarizer/tasks/main.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml
index c02197a4c..6c2fc2ec9 100644
--- a/roles/sugarizer/tasks/main.yml
+++ b/roles/sugarizer/tasks/main.yml
@@ -1,10 +1,10 @@
 # 0. CLEAN UP PRIOR VERSIONS OF SUGARIZER (NEEDS WORK!)
 
-- name: Wipe /library/www/html/sugarizer* if installing sugarizer-1.0
-  shell: "rm -rf {{ doc_root }}/sugarizer*"
-  args:
-    warn: no
-  when: sugarizer_version == "sugarizer-1.0"
+# - name: Wipe /library/www/html/sugarizer* if installing sugarizer-1.0
+#   shell: "rm -rf {{ doc_root }}/sugarizer*"
+#   args:
+#     warn: no
+#   when: sugarizer_version == "sugarizer-1.0"
 
 
 # 1. DOWNLOAD+LINK /opt/iiab/sugarizer
@@ -12,7 +12,7 @@
 - name: Clone llaske/sugarizer ({{ sugarizer_git_version }}) from GitHub to /opt/iiab (MAY DOWNLOAD 600+ MB)
   git:
     repo: https://github.com/llaske/sugarizer
-    dest: "{{ sugarizer_location }}/{{ sugarizer_version }}"
+    dest: "{{ sugarizer_location }}/{{ sugarizer_dir_version }}"
     version: "{{ sugarizer_git_version }}"
     force: yes
     depth: 1
@@ -20,7 +20,7 @@
 
 - name: Create symlink /opt/iiab/sugarizer -> /opt/iiab/{{ sugarizer_version }}
   file:
-    src: "{{ sugarizer_location }}/{{ sugarizer_version }}"
+    src: "{{ sugarizer_location }}/{{ sugarizer_dir_version }}"
     dest: "{{ sugarizer_location }}/sugarizer"
     state: link
 
@@ -45,7 +45,7 @@
 - name: Clone llaske/sugarizer-server ({{ sugarizer_server_git_version }}) from GitHub to /opt/iiab
   git:
     repo: https://github.com/llaske/sugarizer-server
-    dest: "{{ sugarizer_location }}/{{ sugarizer_server_version }}"
+    dest: "{{ sugarizer_location }}/{{ sugarizer_server_dir_version }}"
     version: "{{ sugarizer_server_git_version }}"
     force: yes
     depth: 1
@@ -53,14 +53,14 @@
 
 - name: Create symbolic link /opt/iiab/sugarizer-server -> /opt/iiab/{{ sugarizer_server_version }}
   file:
-    src: "{{ sugarizer_location }}/{{ sugarizer_server_version }}"
+    src: "{{ sugarizer_location }}/{{ sugarizer_server_dir_version }}"
     dest: "{{ sugarizer_location }}/sugarizer-server"
     state: link
 
 
 # 3. INSTALL A GOOD VERSION OF Node.js AND npm
 
-# 2019-01-16: @jvonau's PR #1403 moved installation of Node.js (8.x for now) &
+# 2019-01-16/29: @jvonau's PR #1403 moved install of Node.js (10.x for now) &
 # npm to roles/nodejs/tasks/main.yml, triggered by roles/sugarizer/meta/main.yml
 
 
@@ -117,8 +117,8 @@
 - name: Run 'npm install --allow-root --unsafe-perm=true' to create /opt/iiab/{{ sugarizer_server_version }}/node_modules (CAN TAKE ~3 MINUTES)
   command: npm install --allow-root --unsafe-perm=true    # "command:" a bit safer than "shell:"
   args:
-    chdir: "{{ sugarizer_location }}/{{  sugarizer_server_version }}"
-    #creates: "{{ sugarizer_location }}/{{ sugarizer_server_version }}/node_modules"    # OLD WAY 2
+    chdir: "{{ sugarizer_location }}/{{  sugarizer_server_git_version }}"
+    #creates: "{{ sugarizer_location }}/{{ sugarizer_server_git_version }}/node_modules"    # OLD WAY 2
   when: internet_available    # "npm install" generally requires Internet access
 # when: internet_available and git_sug_server_output.changed    # OLD WAY 3
 # when: internet_available and not is_F18 and not node_modules_exists    # OLD WAY 1
@@ -133,7 +133,7 @@
 - name: Install path prefix proxy
   command: npm install --allow-root --unsafe-perm=true path-prefix-proxy 
   args:
-    chdir: "{{ sugarizer_location }}/{{  sugarizer_server_version }}"
+    chdir: "{{ sugarizer_location }}/{{  sugarizer_server_git_version }}"
   when: internet_available
 
 
@@ -147,7 +147,7 @@
     owner: root
     group: root
   with_items:
-    - { src: 'sugarizer.ini', dest: '{{ sugarizer_location }}/{{ sugarizer_server_version }}/env/sugarizer.ini', mode: '0644' }
+    - { src: 'sugarizer.ini', dest: '{{ sugarizer_location }}/{{ sugarizer_server_git_version }}/env/sugarizer.ini', mode: '0644' }
     - { src: 'sugarizer.conf', dest: '/etc/apache2/sites-available', mode: '0644' }
     - { src: 'sugarizer.service.j2', dest: '/etc/systemd/system/sugarizer.service', mode: '0644' }
     - { src: 'sugarizer.js', dest: '/opt/iiab/sugarizer-server', mode: '0644' }
@@ -171,9 +171,9 @@
 - name: Enable & Restart systemd service if sugarizer_enabled, with "systemctl daemon-reload" (in case mongodb.service changed?)
   systemd:
     name: sugarizer
+    daemon_reload: yes
     enabled: yes
     state: restarted
-    daemon_reload: yes
   when: sugarizer_enabled
   
 - name: "Disable systemd service, if sugarizer_enabled: False"