From 57ff2cdb90668e032838cb5d6c57af2ba8b771f0 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 30 Jan 2019 19:44:16 -0500
Subject: [PATCH] Update main.yml

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

diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml
index f56c7f546..76c2057d7 100644
--- a/roles/sugarizer/tasks/main.yml
+++ b/roles/sugarizer/tasks/main.yml
@@ -77,9 +77,9 @@
 # OLD WAY 2: "creates: ..." checks for non-existence of /opt/iiab/sugarizer-server-1.0/node_modules
 # OLD WAY 3: set "register: git_sug_server_output" above, then as nec delete /opt/iiab/sugarizer-server-1.0/node_modules "when: git_sug_server_output.changed" and as nec run "npm install"
 
-#- name: Check for /opt/iiab/{{ sugarizer_server_dir_version }}/node_modules
+#- name: Check for /opt/iiab/sugarizer-server/node_modules
 #  stat:
-#    path: "{{ sugarizer_location }}/{{ sugarizer_server_dir_version }}/node_modules"
+#    path: "{{ sugarizer_location }}/sugarizer-server/node_modules"
 #  register: nmtest
 #  ignore_errors: true
 #
@@ -119,11 +119,11 @@
 # gets the job done, for now!)
 
 #- name: Create the express framework for Node.js (OS's other than Fedora 18)
-- name: Run 'npm install --allow-root --unsafe-perm=true' to create /opt/iiab/{{ sugarizer_server_dir_version }}/node_modules (CAN TAKE ~5 MINUTES)
+- name: Run 'npm install --allow-root --unsafe-perm=true' to create /opt/iiab/sugarizer-server/node_modules (CAN TAKE ~5 MINUTES)
   command: npm install --allow-root --unsafe-perm=true    # "command:" a bit safer than "shell:"
   args:
-    chdir: "{{ sugarizer_location }}/{{  sugarizer_server_dir_version }}"
-    #creates: "{{ sugarizer_location }}/{{ sugarizer_server_dir_version }}/node_modules"    # OLD WAY 2
+    chdir: "{{ sugarizer_location }}/sugarizer-server"
+    #creates: "{{ sugarizer_location }}/sugarizer-server/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
@@ -135,10 +135,10 @@
 #  when: internet_available and is_F18 and not node_modules_exists
 
 # Add a nodejs express function that appends a prefix to urls
-- name: Install path prefix proxy
-  command: npm install --allow-root --unsafe-perm=true path-prefix-proxy 
+- name: Run 'npm install --allow-root --unsafe-perm=true path-prefix-proxy' to create /opt/iiab/sugarizer-server/node_modules/path-prefix-proxy
+  command: npm install --allow-root --unsafe-perm=true path-prefix-proxy
   args:
-    chdir: "{{ sugarizer_location }}/{{  sugarizer_server_dir_version }}"
+    chdir: "{{ sugarizer_location }}/sugarizer-server"
   when: internet_available
 
 
@@ -154,8 +154,8 @@
   with_items:
     - { src: 'sugarizer.service', dest: '/etc/systemd/system/sugarizer.service', mode: '0644' }
     - { src: 'sugarizer.conf.j2', dest: '/etc/apache2/sites-available/sugarizer.conf', mode: '0644' }
-    #- { src: 'sugarizer.ini.j2', dest: '{{ sugarizer_location }}/{{ sugarizer_server_dir_version }}/env/sugarizer.ini', mode: '0644' }
-    #- { src: 'sugarizer.js', dest: '{{ sugarizer_location }}/{{ sugarizer_server_dir_version }}', mode: '0644' }
+    #- { src: 'sugarizer.ini.j2', dest: '{{ sugarizer_location }}/sugarizer-server/env/sugarizer.ini', mode: '0644' }
+    #- { src: 'sugarizer.js', dest: '{{ sugarizer_location }}/sugarizer-server', mode: '0644' }
 
 - name: Set Sugarizer port to {{ sugarizer_port }} in /opt/iiab/sugarizer-server/env/sugarizer.ini
   lineinfile: