From 5d847bc88c681a285a5a978d50478fa8d7e0e07b Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 31 Oct 2018 14:59:28 -0400 Subject: [PATCH 1/4] Update main.yml --- roles/cups/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/cups/tasks/main.yml b/roles/cups/tasks/main.yml index 8d8b82e4c..e0c9f3cb1 100644 --- a/roles/cups/tasks/main.yml +++ b/roles/cups/tasks/main.yml @@ -7,7 +7,7 @@ tags: - download -- name: Put our own /etc/cups/cupsd.conf in place, to permit local LAN admin +- name: Install our own /etc/cups/cupsd.conf from template, to permit local LAN admin template: src: cupsd.conf dest: /etc/cups/cupsd.conf From 84bcfbaffa0b3435716c41bd534fc64b253387db Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 31 Oct 2018 15:09:21 -0400 Subject: [PATCH 2/4] Update main.yml --- roles/sugarizer/tasks/main.yml | 35 +++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 973939583..4c499c837 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/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 }}" From fa814a257d531ec90d33fa08aa73167ec4ebfae0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 31 Oct 2018 15:12:36 -0400 Subject: [PATCH 3/4] Update main.yml --- roles/sugarizer/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 4c499c837..f857338d0 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -197,7 +197,7 @@ state: link when: sugarizer_enabled and is_debuntu -- name: Remove symlink /etc/apache2/sites-enabled/sugarizer.conf, if sugarizer_enabled: False" (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 From 0b6369c555663f1821171f47257b0f31661972f0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 31 Oct 2018 15:13:28 -0400 Subject: [PATCH 4/4] Update main.yml --- roles/sugarizer/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index f857338d0..33def01e3 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -197,7 +197,7 @@ state: link when: sugarizer_enabled and is_debuntu -- name: "Remove symlink /etc/apache2/sites-enabled/sugarizer.conf, if sugarizer_enabled: False" (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