Merge pull request #101 from iiab/master

sync from iiab/iiab

roles/sugarizer/defaults/main.yml

@@ -5,13 +5,11 @@ sugarizer_location: "{{ iiab_base }}"    # /opt/iiab
 
 sugarizer_version: sugarizer-1.0
 sugarizer_git_version: v1.0.1
-# PLEASE HELP MONITOR https://github.com/llaske/sugarizer/releases FOR
+# PLEASE HELP MONITOR https://github.com/llaske/sugarizer/releases
-# STABLE/OFFICIAL RELEASES!
 
 sugarizer_server_version: sugarizer-server-1.0
-sugarizer_server_git_version: master
+sugarizer_server_git_version: v1.0.1    # "master" worked over July 11-14, 2018
-# CLONING SUGARIZER-SERVER'S MASTER BRANCH IS NOT A LONG-TERM SOLUTION,
+# PLEASE HELP MONITOR https://github.com/llaske/sugarizer-server/releases
-# SO LET'S MONITOR https://github.com/llaske/sugarizer-server/releases
-# FOR A MORE STABLE/OFFICIAL RELEASE DURING MID-2018!
 
-node_modules_exists: False
+# Unused as of 2018-07-14
+# node_modules_exists: False

roles/sugarizer/tasks/main.yml

@@ -4,9 +4,9 @@
   shell: "rm -rf {{ doc_root }}/sugarizer*"
   when: sugarizer_version == "sugarizer-1.0"
 
-# 1. DOWNLOAD /opt/iiab/sugarizer
+# 1. DOWNLOAD+LINK /opt/iiab/sugarizer
 
-- name: Clone llaske/sugarizer ({{ sugarizer_git_version }}) from GitHub to /opt/iiab
+- name: Clone llaske/sugarizer ({{ sugarizer_git_version }}) from GitHub to /opt/iiab (CAN TAKE SEVERAL MINUTES)
   git:
     repo: https://github.com/llaske/sugarizer
     dest: "{{ sugarizer_location }}/{{ sugarizer_version }}"
@@ -21,9 +21,9 @@
     dest: "{{ sugarizer_location }}/sugarizer"
     state: link
 
-# 2. DOWNLOAD /opt/iiab/sugarizer-server
+# 2. DOWNLOAD+LINK /opt/iiab/sugarizer-server
 
-# July 2018: http://download.iiab.io/packages/sugarizer-server-1.0.tar.gz
+# 2018-07-11: http://download.iiab.io/packages/sugarizer-server-1.0.tar.gz
 # was flawed, as documented at:
 #    https://github.com/iiab/iiab/pull/814#issuecomment-404211098
 # Versions of MongoDB, npm (& Node.js ?) matter!  Sugarizer 1.0 Context:
@@ -31,6 +31,13 @@
 # Going forward let's "git clone" IIAB's preferred versions, of sugarizer
 # AND sugarizer-server, as specified in roles/sugarizer/defaults/main.yml
 
+# 2018-07-14 BLOAT: git works well BUT even with "depth: 1"
+# - 229MB is unfort downloaded to /opt/iiab/sugarizer/.git
+# - 1.4MB is unfort downloaded to /opt/iiab/sugarizer-server/.git
+
+# CLARIF: during repeat runs of "./runrole sugarizer", this git sync shows
+# "changed" (whereas above git sync shows "ok").  Reason: "npm install"
+# (below) modifies /opt/iiab/sugarizer-server/node_modules
 - name: Clone llaske/sugarizer-server ({{ sugarizer_server_git_version }}) from GitHub to /opt/iiab
   git:
     repo: https://github.com/llaske/sugarizer-server
@@ -40,7 +47,7 @@
     depth: 1
   when: internet_available
 
-- name: Create symbolic link /opt/iiab/sugarizer-server -> /opt/iiab/{ sugarizer_server_version }}
+- name: Create symbolic link /opt/iiab/sugarizer-server -> /opt/iiab/{{ sugarizer_server_version }}
   file:
     src: "{{ sugarizer_location }}/{{ sugarizer_server_version }}"
     dest: "{{ sugarizer_location }}/sugarizer-server"
@@ -48,13 +55,11 @@
 
 # 3. INSTALL A GOOD VERSION OF Node.js AND npm
 
-# Both Raspbian and Debian 9 STILL need this approach as of July 2018,
+- name: Set up Node.js 8.x apt sources (debuntu, but avoid ubuntu-18)
-# as documented at https://github.com/iiab/iiab/issues/798#issuecomment-404324530
-- name: Set up Node.js 8.x apt sources (debuntu but avoid ubuntu-18)
   shell: curl -sL https://deb.nodesource.com/setup_8.x | bash -
   when: internet_available and is_debuntu and not is_ubuntu_18
 
-- name: Install latest Node.js which includes /usr/bin/npm (debuntu but avoid ubuntu-18)
+- name: Install latest Node.js which includes /usr/bin/npm (debuntu, but avoid ubuntu-18)
   package:
     name: nodejs
     # name: nodejs=8.x
@@ -62,51 +67,71 @@
     # state: present
   when: internet_available and is_debuntu and not is_ubuntu_18
 
-- name: Install Node.js and npm (ubuntu-18)
+# 2018-07-14: BOTH STEPS ABOVE TAKE TIME, but Raspbian (apt offers npm
+# 1.4.21) & Debian 9 (apt offers no npm!) STILL NEED the above
+# nodesource.com approach to get a version of npm that works with Sugarizer:
+# https://github.com/iiab/iiab/issues/798#issuecomment-404324530
+#
+# MORE POSITIVELY: this nodesource.com approach (brings in npm 5.6.0 with
+# nodejs 8.11.3 for now, to any OS) would also work on Ubuntu 18.04, and
+# might even bring about a sane consistency across mainline OS's?
+#
+# BUT FOR NOW: Ubuntu 18.04's apt (approach below) brings in npm 3.5.2,
+# which appears suffic "SO FAR"?  18.04's nodejs 8.10.0 is more reassuring!
+
+# CRAZY IDEA: most versions of npm can upgrade themselves to the latest
+# (6.2.0 for now) using command "npm install -g npm", if that helps us in
+# future, e.g. TK's memory issue etc?  If so, be CAREFUL this puts npm
+# in /usr/local/bin on Ubuntu 18.04 -- unlike Ubuntu 16.04 and Raspbian
+# where it upgrades /usr/bin/npm in place:
+# https://askubuntu.com/questions/1036278/npm-is-incorrect-version-on-latest-ubuntu-18-04-installation
+
+- name: Install Node.js and npm (ubuntu-18 or not debuntu)
   package:
     name: "{{ item }}"
     state: latest
-  when: internet_available and is_ubuntu_18
-  with_items:
-    - nodejs
-    - npm
-
-- name: Install npm (OS's other than debuntu)
-  package:
-    name: "{{ item }}"
-    state: present
-  when: internet_available and not is_debuntu
   with_items:
     - nodejs
     - npm
+  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" fails on Raspbian 9 if not other OS's
+# Re-running "npm install" USED TO fail on Raspbian 9 if not other OS's.
-- name: Check for /opt/iiab/{{ sugarizer_server_version }}/node_modules
+# Several strategies to avoid re-running it:
-  stat:
+# OLD WAY 1: test & set flag node_modules_exists: True
-    path: "{{ sugarizer_location }}/{{ sugarizer_server_version }}/node_modules"
+# OLD WAY 2: "creates: ..." checks for non-existence of /opt/iiab/sugarizer-server-1.0/node_modules
-  register: nmtest
+# 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"
-  ignore_errors: true
 
-- name: Set a flag to prevent re-running of "npm install"
+# NEW WAY: run "npm install" every time, as modern versions of npm are
-  set_fact:
+# incremental, with sanity checks (as tested with npm 3.5.2 and 5.6.0)
-    node_modules_exists: True
-  when: nmtest.stat is defined and nmtest.stat.exists
 
-- name: Create the express framework for Node.js (OS's other than Fedora 18)
+#- name: Check for /opt/iiab/{{ sugarizer_server_version }}/node_modules
-  shell: npm install
+#  stat:
+#    path: "{{ sugarizer_location }}/{{ sugarizer_server_version }}/node_modules"
+#  register: nmtest
+#  ignore_errors: true
+#
+#- name: Set a flag to prevent re-running of "npm install"
+#  set_fact:
+#    node_modules_exists: True
+#  when: nmtest.stat is defined and nmtest.stat.exists
+
+#- name: Create the express framework for Node.js (OS's other than Fedora 18)
+- name: Run 'npm install' to create /opt/iiab/{{ sugarizer_server_version }}/node_modules (CAN TAKE SEVERAL MINUTES)
+  command: npm install    # slightly safer than "shell:"
   args:
     chdir: "{{ sugarizer_location }}/{{  sugarizer_server_version }}"
-    creates: "{{ sugarizer_location }}/{{ sugarizer_server_version }}/node_modules"
+    #creates: "{{ sugarizer_location }}/{{ sugarizer_server_version }}/node_modules"    # OLD WAY 2
-    #creates: "{{ sugarizer_location }}/{{ sugarizer_server_version }}/server/node_modules"
+  when: internet_available    # "npm install" generally requires Internet access
-  when: not is_F18 and not node_modules_exists
+# 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
 
-- name: Create the express framework for Node.js (Fedora 18)
+#- name: Create the express framework for Node.js (Fedora 18)
-  shell: npm install
+#  shell: npm install
-  args:
+#  args:
-    chdir: "{{ sugarizer_location }}/sugarizer/server"
+#    chdir: "{{ sugarizer_location }}/sugarizer/server"
-  when: is_F18 and not node_modules_exists
+#  when: internet_available and is_F18 and not node_modules_exists
 
 # 5. PLACE CONFIG FILES
 
@@ -118,9 +143,9 @@
     owner: root
     group: root
   with_items:
-    - { src: 'sugarizer.service.j2', dest: '/etc/systemd/system/sugarizer.service', mode: '0644' }
     - { src: 'sugarizer.ini', dest: '{{ sugarizer_location }}/{{ sugarizer_server_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' }
 
 - name: Create symlink for short URL http://box/sugarizer
   file:
@@ -136,17 +161,15 @@
     enabled: yes
     state: restarted
   with_items:
-    - { name: mongodb }
+#   - { 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: "{{ item.name }}"
+    name: sugarizer
     enabled: no
     state: stopped
-  with_items:
-    - { name: sugarizer }
   when: not sugarizer_enabled
 
 - name: Add 'sugarizer' to list of services at /etc/iiab/iiab.ini