external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #322 from iiab/master

Browse source 
sync from iiab:master
This commit is contained in:
A Holt 2019-12-26 12:30:00 -05:00 • committed by GitHub
commit 730ada875f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/nginx/templates/iiab.conf.j2
View file

@ -1,5 +1,5 @@
location / { location / {
rewrite ^/$ $1/{{ iiab_home_url }}; rewrite ^/$ $1{{ iiab_home_url }};
} }
location /usb { location /usb {

6
roles/sugarizer/tasks/install.yml
View file

@ -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: 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 != "10.x") when: sugarizer_install and (nodejs_version != "12.x")
# 1. DOWNLOAD+LINK /opt/iiab/sugarizer # 1. DOWNLOAD+LINK /opt/iiab/sugarizer

2
vars/default_vars.yml
View file

@ -369,7 +369,7 @@ mosquitto_port: 1883
# Node.js version used by roles/nodejs/tasks/main.yml for 3 roles: # Node.js version used by roles/nodejs/tasks/main.yml for 3 roles:
# nodered (Node-RED), pbx (Asterix, FreePBX) & sugarizer (Sugarizer) # 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 # Flow-based visual programming for wiring together IoT hardware devices etc
nodered_install: False nodered_install: False