From a95a4c5f99b2457da7303bd18a7d65c6f6e9655b Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 22 Sep 2017 02:14:14 -0500 Subject: [PATCH 1/4] Install nodejs correctly --- roles/sugarizer/tasks/main.yml | 46 ++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index e538bd14c..004bf6f32 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -4,6 +4,7 @@ - name: Untar it to target location command: tar xzf {{ downloads_dir }}/{{ sugarizer_version }}.tar.gz -C {{ sugarizer_location }} + creates="{{ sugarizer_location }}/{{ sugarizer_version }}/index.html" - name: Create a symbolic link from generic url to version specific location file: dest={{ sugarizer_location }}/sugarizer @@ -11,15 +12,19 @@ state=link - name: Install sugarizer required packages - package: name=nodejs + package: name={{ item }} state=present -# - npm - when: internet_available + with_items: + - node-gyp + when: internet_available and is_debuntu - name: Install npm non debian - package: name=npm + package: name={{ item }} state=present - when: internet_available and not is_debian + with_items: + - nodejs + - npm + when: internet_available and not is_debuntu # attempting to reinstall npn is broken on raspbian 9 - name: check for npm already installed @@ -36,7 +41,7 @@ when: internet_available and is_debian and not npm_exists - name: Actually get it installed - command: apt-get install -y npm + command: apt-get install -y nodejs when: internet_available and is_debian and not npm_exists - name: Create systemd files and copy our ini file @@ -68,22 +73,21 @@ chdir: "{{ sugarizer_location }}/sugarizer/server" when: is_F18 -#- name: enable services -# service: name={{ item.name }} -# enabled=yes -# state=restarted -# with_items: -# - { name: sugarizer } -# when: sugarizer_enabled +- name: enable services + service: name={{ item.name }} + enabled=yes + state=restarted + with_items: + - { name: sugarizer } + when: sugarizer_enabled - -#- name: disable services -# service: name={{ item.name }} -# enabled=no -# state=stopped -# with_items: -# - { name: sugarizer } -# when: not sugarizer_enabled +- name: disable services + service: name={{ item.name }} + enabled=no + state=stopped + with_items: + - { name: sugarizer } + when: not sugarizer_enabled - name: add sugarizer to service list ini_file: dest='{{ service_filelist }}' From fe8785ce8019441625377e4f2ac0459dcdb7ae2d Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 22 Sep 2017 12:31:11 -0400 Subject: [PATCH 2/4] sugarizer - remove 10-second restart --- roles/sugarizer/templates/sugarizer.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sugarizer/templates/sugarizer.service.j2 b/roles/sugarizer/templates/sugarizer.service.j2 index 298e95159..23e5a9206 100644 --- a/roles/sugarizer/templates/sugarizer.service.j2 +++ b/roles/sugarizer/templates/sugarizer.service.j2 @@ -6,7 +6,7 @@ Requires=After=mongodb.service # Requires the mongodb service to run first WorkingDirectory={{ sugarizer_location }}/sugarizer/server/ ExecStart=/usr/bin/node sugarizer.js Restart=always -RestartSec=10 # Restart service after 10 seconds if node service crashes +#RestartSec=10 # Restart service after 10 seconds if node service crashes StandardOutput=syslog # Output to syslog StandardError=syslog # Output to syslog SyslogIdentifier=sugarizer From f311b4a75ff814f2acbf25319c7181b1fe34f3b4 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 12 Oct 2017 14:33:10 -0500 Subject: [PATCH 3/4] used is_debuntu for apt sources - better discriptions of actions - use package --- roles/sugarizer/tasks/main.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 004bf6f32..98f920e44 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -2,6 +2,7 @@ get_url: url={{ iiab_download_url }}/{{ sugarizer_version }}.tar.gz dest={{ downloads_dir }}/{{ sugarizer_version }}.tar.gz +#fixme - name: Untar it to target location command: tar xzf {{ downloads_dir }}/{{ sugarizer_version }}.tar.gz -C {{ sugarizer_location }} creates="{{ sugarizer_location }}/{{ sugarizer_version }}/index.html" @@ -11,14 +12,14 @@ src={{ sugarizer_location }}/{{ sugarizer_version }} state=link -- name: Install sugarizer required packages +- name: Install sugarizer required packages - is_debuntu package: name={{ item }} state=present with_items: - node-gyp when: internet_available and is_debuntu -- name: Install npm non debian +- name: Install npm non is_debuntu package: name={{ item }} state=present with_items: @@ -36,13 +37,14 @@ npm_exists: True when: npm.stat.exists is defined and npm.stat.exists -- name: Install npm on debian -- set up apt sources +- name: Set up apt sources on is_debuntu shell: curl -sL https://deb.nodesource.com/setup_6.x | bash - - when: internet_available and is_debian and not npm_exists + when: internet_available and is_debuntu and not npm_exists -- name: Actually get it installed - command: apt-get install -y nodejs - when: internet_available and is_debian and not npm_exists +- name: Actually get it installed on is_debuntu + package: name=nodejs + state=present + when: internet_available and is_debuntu and not npm_exists - name: Create systemd files and copy our ini file template: src={{ item.src }} @@ -51,7 +53,7 @@ group=root mode=0644 with_items: -# - { src: 'sugarizer.service.j2' , dest: '/etc/systemd/system/sugarizer.service'} + - { src: 'sugarizer.service.j2' , dest: '/etc/systemd/system/sugarizer.service'} - { src: 'sugarizer.ini' , dest: '{{ sugarizer_location }}/sugarizer/server' } # - { src: 'sugarizer.conf' , dest: '/etc/apache2/sites-available' } @@ -60,20 +62,20 @@ # dest=/etc/apache2/sites-enabled/sugarizer.conf # state=link -- name: Create the express framework for node.js +- name: Create the express framework for node.js - ALL less F18 shell: npm install args: chdir: "{{ sugarizer_location }}/sugarizer/server" creates: "{{ sugarizer_location }}/sugarizer/server/node_modules" when: not is_F18 -- name: Create the express framework for node.js +- name: Create the express framework for node.js - F18 shell: npm install args: chdir: "{{ sugarizer_location }}/sugarizer/server" when: is_F18 -- name: enable services +- name: enable services - All service: name={{ item.name }} enabled=yes state=restarted @@ -81,7 +83,7 @@ - { name: sugarizer } when: sugarizer_enabled -- name: disable services +- name: disable services - All service: name={{ item.name }} enabled=no state=stopped From f3ff239157022c773483d24d5854e29b048f367c Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 13 Oct 2017 09:03:46 -0500 Subject: [PATCH 4/4] always install packages - skip npm install when already run --- roles/sugarizer/tasks/main.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 98f920e44..60b55f478 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -28,23 +28,26 @@ when: internet_available and not is_debuntu # attempting to reinstall npn is broken on raspbian 9 -- name: check for npm already installed +- name: check for sugarizer already installed stat: path={{ sugarizer_location }}/sugarizer/server/node_modules register: npm - name: set a flag to abort second attempt to install - set_fact: + set_fact: npm_exists: True when: npm.stat.exists is defined and npm.stat.exists - name: Set up apt sources on is_debuntu shell: curl -sL https://deb.nodesource.com/setup_6.x | bash - - when: internet_available and is_debuntu and not npm_exists + when: internet_available and is_debuntu - name: Actually get it installed on is_debuntu - package: name=nodejs + package: name={{ item }} state=present - when: internet_available and is_debuntu and not npm_exists + with_items: + - nodejs + - npm + when: internet_available and is_debuntu - name: Create systemd files and copy our ini file template: src={{ item.src }} @@ -67,13 +70,13 @@ args: chdir: "{{ sugarizer_location }}/sugarizer/server" creates: "{{ sugarizer_location }}/sugarizer/server/node_modules" - when: not is_F18 + when: not is_F18 and not npm_exists - name: Create the express framework for node.js - F18 shell: npm install args: chdir: "{{ sugarizer_location }}/sugarizer/server" - when: is_F18 + when: is_F18 and not npm_exists - name: enable services - All service: name={{ item.name }}