From 79e1bb164b73fba180e47a7e5dc2273244580ee4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 20 Dec 2019 09:33:26 -0500 Subject: [PATCH 1/4] http://box shouldn't redirect to http://box//home/ --- roles/nginx/templates/iiab.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nginx/templates/iiab.conf.j2 b/roles/nginx/templates/iiab.conf.j2 index 568a4dcc4..187e30e36 100644 --- a/roles/nginx/templates/iiab.conf.j2 +++ b/roles/nginx/templates/iiab.conf.j2 @@ -1,5 +1,5 @@ location / { - rewrite ^/$ $1/{{ iiab_home_url }}; + rewrite ^/$ $1{{ iiab_home_url }}; } location /usb { From 5ebcb46ba0f487bd969d41ea05c6375afb0fc264 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 21 Dec 2019 11:31:06 -0500 Subject: [PATCH 2/4] nodejs_version: 10.x -> 12.x --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index b04ed6eb6..72dfb04f5 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -369,7 +369,7 @@ mosquitto_port: 1883 # Node.js version used by roles/nodejs/tasks/main.yml for 3 roles: # nodered (Node-RED), pbx (Asterix, FreePBX) & sugarizer (Sugarizer) -nodejs_version: 10.x # was 8.x until 2019-02-02 +nodejs_version: 12.x # was 8.x until 2019-02-02, was 10.x until 2019-12-21 # Flow-based visual programming for wiring together IoT hardware devices etc nodered_install: False From 118e438f705b6401e2fbb55d3e09f0f1befd0ae9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 21 Dec 2019 13:21:19 -0500 Subject: [PATCH 3/4] Mandate Node.js 12.x for Sugarizer --- roles/sugarizer/tasks/install.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/sugarizer/tasks/install.yml b/roles/sugarizer/tasks/install.yml index 6d41de7c4..cb66ece59 100644 --- a/roles/sugarizer/tasks/install.yml +++ b/roles/sugarizer/tasks/install.yml @@ -1,7 +1,7 @@ -- name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 10.x +- name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 12.x fail: msg: "Sugarizer install cannot proceed, as it currently requires Node.js 10.x, and your nodejs_version is set to {{ nodejs_version }}. Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml" - when: sugarizer_install and (nodejs_version != "10.x") + when: sugarizer_install and (nodejs_version != "12.x") # 1. DOWNLOAD+LINK /opt/iiab/sugarizer From 093a194ef2644b14bae00d2e9aecce881aa6327e Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 21 Dec 2019 13:27:02 -0500 Subject: [PATCH 4/4] Update install.yml --- roles/sugarizer/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sugarizer/tasks/install.yml b/roles/sugarizer/tasks/install.yml index cb66ece59..dc9b9e120 100644 --- a/roles/sugarizer/tasks/install.yml +++ b/roles/sugarizer/tasks/install.yml @@ -1,6 +1,6 @@ - name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 12.x fail: - msg: "Sugarizer install cannot proceed, as it currently requires Node.js 10.x, and your nodejs_version is set to {{ nodejs_version }}. Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml" + msg: "Sugarizer install cannot proceed, as it currently requires Node.js 12.x, and your nodejs_version is set to {{ nodejs_version }}. Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml" when: sugarizer_install and (nodejs_version != "12.x")