From dccbd181ada338253c8445745464f00e5a87683b Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 13:13:47 -0500 Subject: [PATCH 01/28] Update main.yml --- roles/nodejs/tasks/main.yml | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/roles/nodejs/tasks/main.yml b/roles/nodejs/tasks/main.yml index 0b6f15d4b..474b0287c 100644 --- a/roles/nodejs/tasks/main.yml +++ b/roles/nodejs/tasks/main.yml @@ -29,14 +29,20 @@ # nodejs_version_installed.stderr == "/bin/sh: 1: nodejs: not found" # BOTH ABOVE (incl non-null stderr) are USED BELOW to confirm install is nec! -- name: "ENFORCE PRECONDITION: Stop installing (intentionally fail) IF an installed 'nodejs' version isn't {{ nodejs_version }}" - fail: - msg: > - PLEASE REMOVE 'nodejs' VERSION {{ nodejs_version_installed.stdout }} AS - IT DOES NOT MATCH THE REQUIRED nodejs_version: {{ nodejs_version }} -- - as set in /opt/iiab/iiab/vars/default_vars.yml and/or - /etc/iiab/local_vars.yml -- then re-run this IIAB installer. - when: nodejs_version_installed is defined and nodejs_version_installed.stdout != nodejs_version and nodejs_version_installed.stderr == "" +#- name: "ENFORCE PRECONDITION: Stop installing (intentionally fail) IF an installed 'nodejs' version isn't {{ nodejs_version }}" +# fail: +# msg: > +# PLEASE REMOVE 'nodejs' VERSION {{ nodejs_version_installed.stdout }} AS +# IT DOES NOT MATCH THE REQUIRED nodejs_version: {{ nodejs_version }} -- +# as set in /opt/iiab/iiab/vars/default_vars.yml and/or +# /etc/iiab/local_vars.yml -- then re-run this IIAB installer. +# when: nodejs_version_installed is defined and nodejs_version_installed.stdout != nodejs_version and nodejs_version_installed.stderr == "" + +- name: ASK apt/yum/dnf TO REMOVE PRE-EXISTING Node.js {{ nodejs_version_installed.stdout }} (IF IT'S NOT {{ nodejs_version }}) + package: + name: nodejs + state: absent + when: nodejs_version_installed is defined and nodejs_version_installed.stdout != nodejs_version and nodejs_version_installed.stdout != "" - name: Warn if Node.js {{ nodejs_version}} already installed & might be updated debug: @@ -46,6 +52,13 @@ # 2. INSTALL Node.js USING nodesource.com +# SHOULD NOT BE NEC, AS STANZA BELOW SHOULD OVERWRITE /etc/apt/sources.list.d/nodesource.list REGARDLESS +#- name: Clear prior /etc/apt/sources.list.d/nodesource.list (permitting downgrade if nec) +# file: +# path: /etc/apt/sources.list.d/nodesource.list +# state: absent +# when: internet_available and is_debuntu + - name: Set up Node.js {{ nodejs_version }} apt sources (debuntu) shell: curl -sL https://deb.nodesource.com/setup_{{ nodejs_version }} | bash - args: From 3341453487aa4f82475cb15960c4bf1455c072b6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 13:31:52 -0500 Subject: [PATCH 02/28] Update main.yml --- roles/nodejs/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/nodejs/tasks/main.yml b/roles/nodejs/tasks/main.yml index 474b0287c..3c6b075f2 100644 --- a/roles/nodejs/tasks/main.yml +++ b/roles/nodejs/tasks/main.yml @@ -38,6 +38,7 @@ # /etc/iiab/local_vars.yml -- then re-run this IIAB installer. # when: nodejs_version_installed is defined and nodejs_version_installed.stdout != nodejs_version and nodejs_version_installed.stderr == "" +# BRUTAL but ensures consistency across OS's / distros like Raspbian Desktop & Ubermix that often include an older version of Node.js - name: ASK apt/yum/dnf TO REMOVE PRE-EXISTING Node.js {{ nodejs_version_installed.stdout }} (IF IT'S NOT {{ nodejs_version }}) package: name: nodejs From 688427ddf5d03563dbfca0e66c7ef1c5ee9bd30f Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 13:32:49 -0500 Subject: [PATCH 03/28] Update main.yml --- roles/nodered/tasks/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/nodered/tasks/main.yml b/roles/nodered/tasks/main.yml index 1a8fc888e..7f3c8373d 100644 --- a/roles/nodered/tasks/main.yml +++ b/roles/nodered/tasks/main.yml @@ -1,6 +1,13 @@ # 2019-01-16: @jvonau's PR #1403 moved installation of Node.js (8.x for now) & # npm to roles/nodejs/tasks/main.yml, triggered by roles/nodered/meta/main.yml +# BRUTAL but ensures consistency across OS's / distros like Raspbian Desktop & Ubermix that often include an older version of Node-RED +- name: ASK apt/yum/dnf TO REMOVE PRE-EXISTING Node-RED (IF IT WAS INSTALLED BY OS PKG MANAGER) + package: + name: nodered + state: absent + when: nodered_install + - name: 'npm install node-red packages globally: node-red, node-red-admin, node-red-dashboard' shell: npm install -g --unsafe-perm node-red node-red-admin node-red-dashboard when: nodered_install From 786ccef90499b7db911a48a71ee7918f15dd40fd Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 17:50:01 -0500 Subject: [PATCH 04/28] Update node-red.service.j2 --- roles/nodered/templates/node-red.service.j2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/nodered/templates/node-red.service.j2 b/roles/nodered/templates/node-red.service.j2 index d6c9df000..aa35f8d80 100644 --- a/roles/nodered/templates/node-red.service.j2 +++ b/roles/nodered/templates/node-red.service.j2 @@ -5,10 +5,12 @@ After=syslog.target network.target [Service] # Ansible template HAD: if is_debian_8 or is_debian_9 or is_ubuntu_16 or is_ubuntu_17 # Ansible template HAD: if is_debuntu +{% if is_rpi %} ExecStart=/usr/bin/node-red-pi --max-old-space-size=128 -v -# Ansible template HAD: else +{% else %} # ExecStart=/usr/local/bin/node-red-pi --max-old-space-size=128 -v -# Ansible template HAD: endif +ExecStart=/usr/bin/node-red-pi -v +{% endif %} Restart=on-failure KillSignal=SIGINT From b0b37f8a3b804b33a8019e198ffc5a139c062e34 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 18:14:01 -0500 Subject: [PATCH 05/28] only npm install those (of 3) pkgs needed e.g. by Raspbian Desktop --- roles/nodered/tasks/main.yml | 54 ++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/roles/nodered/tasks/main.yml b/roles/nodered/tasks/main.yml index 7f3c8373d..9e282d298 100644 --- a/roles/nodered/tasks/main.yml +++ b/roles/nodered/tasks/main.yml @@ -1,15 +1,53 @@ # 2019-01-16: @jvonau's PR #1403 moved installation of Node.js (8.x for now) & # npm to roles/nodejs/tasks/main.yml, triggered by roles/nodered/meta/main.yml -# BRUTAL but ensures consistency across OS's / distros like Raspbian Desktop & Ubermix that often include an older version of Node-RED -- name: ASK apt/yum/dnf TO REMOVE PRE-EXISTING Node-RED (IF IT WAS INSTALLED BY OS PKG MANAGER) - package: - name: nodered - state: absent +# Too brutal, as this removed customizations on graphical desktop OS's e.g. +# Raspbian Desktop's: +# 1. Node-RED's icon (Raspberry Menu in top-left -> Programming -> Node-RED) +# 2. scripts like {node-red-start, node-red-stop, node-red-log} in /usr/bin +# 3. other changes per /usr/bin/update-nodejs-and-nodered summarized at +# https://nodered.org/docs/hardware/raspberrypi for example low-memory +# flag --max_old_space_size=256 for unit file (any reason we use 128?) +## BRUTAL but ensures consistency across OS's / distros like Raspbian Desktop & Ubermix that often include an older version of Node-RED +#- name: ASK apt/yum/dnf TO REMOVE PRE-EXISTING Node-RED (IF IT WAS INSTALLED BY OS PKG MANAGER) +# package: +# name: nodered +# state: absent +# when: nodered_install + +#- name: 'npm install node-red packages globally: node-red, node-red-admin, node-red-dashboard' +# shell: npm install -g --unsafe-perm node-red node-red-admin node-red-dashboard +# when: nodered_install + +# To protect pre-installed packages within /usr/lib/node_modules in graphical +# desktop OS's like Raspbian Desktop & Ubermix, we now only install those that +# are missing -- among the 3 below. WARNING: THIS COULD POTENTIALLY LEAD TO +# INCOMPATIBILITIES, IF OS'S /usr/lib/node_modules/node-red GETS OUT OF DATE! + +# /usr/lib/node_modules/node-red is PRE-INSTALLED by Raspbian Desktop, even if +# their package (42MB, 0.19.4) is a bit out of date compared to npm's (55MB, +# 0.19.5) as of 2019-02-12. Among others in /usr/lib/node_modules, pre-placed +# by Raspbian Desktop's apt package 'nodered': +# node-red-contrib-ibm-watson-iot, node-red-contrib-play-audio, +# node-red-node-ledborg, node-red-node-ping, node-red-node-pi-sense-hat +# node-red-node-random, node-red-node-serialport, node-red-node-smooth +- name: Globally 'npm install' pkg 'node-red' if /usr/lib/node_modules/node-red missing (most OS's except for Raspbian Desktop) + command: npm install -g --unsafe-perm node-red + creates: /usr/lib/node_modules/node-red when: nodered_install -- name: 'npm install node-red packages globally: node-red, node-red-admin, node-red-dashboard' - shell: npm install -g --unsafe-perm node-red node-red-admin node-red-dashboard +# NOT pre-installed by Raspbian Desktop as of 2019-02-12...so we install this +# on most all OS's: +- name: Globally 'npm install' pkg 'node-red-admin' if /usr/lib/node_modules/node-red-admin missing (most OS's) + command: npm install -g --unsafe-perm node-red-admin + creates: /usr/lib/node_modules/node-red-admin + when: nodered_install + +# NOT pre-installed by Raspbian Desktop as of 2019-02-12...so we install this +# on most all OS's: +- name: Globally 'npm install' pkg 'node-red-dashboard' if /usr/lib/node_modules/node-red-dashboard missing (most OS's) + command: npm install -g --unsafe-perm node-red-dashboard + creates: /usr/lib/node_modules/node-red-dashboard when: nodered_install - name: Ensure Linux group 'nodered' exists @@ -117,7 +155,7 @@ - option: name value: Node-RED - option: description - value: '"Node-RED is a flow-based development tool for visual programming developed originally by IBM for wiring together hardware devices, APIs and online services as part of the Internet of Things. Node-RED provides a web browser-based flow editor, which can be used to create JavaScript functions."' + value: '"Node-RED is a flow-based development tool for visual programming developed originally by IBM for wiring together hardware devices, APIs and online services as part of the Internet of Things. Node-RED provides a web browser-based flow editor, which can be used to create JavaScript functions."' - option: nodered_install value: "{{ nodered_install }}" - option: nodered_enabled From 96f89a2a4a12b76a4b2c66a695b0f5ecf9e512dc Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 18:23:31 -0500 Subject: [PATCH 06/28] Update main.yml --- roles/nodered/tasks/main.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/roles/nodered/tasks/main.yml b/roles/nodered/tasks/main.yml index 9e282d298..f02b618a9 100644 --- a/roles/nodered/tasks/main.yml +++ b/roles/nodered/tasks/main.yml @@ -33,21 +33,24 @@ # node-red-node-random, node-red-node-serialport, node-red-node-smooth - name: Globally 'npm install' pkg 'node-red' if /usr/lib/node_modules/node-red missing (most OS's except for Raspbian Desktop) command: npm install -g --unsafe-perm node-red - creates: /usr/lib/node_modules/node-red + args: + creates: /usr/lib/node_modules/node-red when: nodered_install # NOT pre-installed by Raspbian Desktop as of 2019-02-12...so we install this # on most all OS's: - name: Globally 'npm install' pkg 'node-red-admin' if /usr/lib/node_modules/node-red-admin missing (most OS's) command: npm install -g --unsafe-perm node-red-admin - creates: /usr/lib/node_modules/node-red-admin + args: + creates: /usr/lib/node_modules/node-red-admin when: nodered_install # NOT pre-installed by Raspbian Desktop as of 2019-02-12...so we install this # on most all OS's: - name: Globally 'npm install' pkg 'node-red-dashboard' if /usr/lib/node_modules/node-red-dashboard missing (most OS's) command: npm install -g --unsafe-perm node-red-dashboard - creates: /usr/lib/node_modules/node-red-dashboard + args: + creates: /usr/lib/node_modules/node-red-dashboard when: nodered_install - name: Ensure Linux group 'nodered' exists From c777f8be2f7dda530dcbd4656addaa5adaa272ab Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 19:12:44 -0500 Subject: [PATCH 07/28] Update main.yml --- roles/nodejs/tasks/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/nodejs/tasks/main.yml b/roles/nodejs/tasks/main.yml index 3c6b075f2..bc2793c92 100644 --- a/roles/nodejs/tasks/main.yml +++ b/roles/nodejs/tasks/main.yml @@ -53,8 +53,10 @@ # 2. INSTALL Node.js USING nodesource.com -# SHOULD NOT BE NEC, AS STANZA BELOW SHOULD OVERWRITE /etc/apt/sources.list.d/nodesource.list REGARDLESS -#- name: Clear prior /etc/apt/sources.list.d/nodesource.list (permitting downgrade if nec) +# 2019-02-12: Should not be nec, as stanza below it should overwrite +# /etc/apt/sources.list.d/nodesource.list regardless! +# +#- name: Clear prior /etc/apt/sources.list.d/nodesource.list (permitting Node.js downgrade if nec) # file: # path: /etc/apt/sources.list.d/nodesource.list # state: absent From eeff914cc666009536912eb0ee661e6560d1de5f Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 19:23:37 -0500 Subject: [PATCH 08/28] Update main.yml --- roles/sugarizer/defaults/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/sugarizer/defaults/main.yml b/roles/sugarizer/defaults/main.yml index b811c64a9..ce2d1e36a 100644 --- a/roles/sugarizer/defaults/main.yml +++ b/roles/sugarizer/defaults/main.yml @@ -15,6 +15,7 @@ sugarizer_git_version: v1.1.0 # WAS: v1.0.1, master sugarizer_server_dir_version: sugarizer-server-dev # WAS: sugarizer-server-1.0, sugarizer-server-master sugarizer_server_git_version: f27bf6acd56aba6d99116ef471ca713b0f0dfed3 # WAS: v1.0.1, master, dev # Above commit (githash f27bf6a... for iiab/iiab PR #1430 from 'dev' branch of -# https://github.com/llaske/sugarizer-server) well-tested Jan 29 - Feb 2 2019. +# https://github.com/llaske/sugarizer-server) well-tested Jan 29 - Feb 12 2019. # -# PLEASE HELP MONITOR https://github.com/llaske/sugarizer-server/releases +# PLEASE HELP MONITOR https://github.com/llaske/sugarizer-server/commits/dev +# AND https://github.com/llaske/sugarizer-server/releases From b688c570afe6a047c0c8d0fe783aac83af091599 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 22:04:01 -0500 Subject: [PATCH 09/28] Update README.rst --- roles/pbx/README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/pbx/README.rst b/roles/pbx/README.rst index f4664fcce..737e53d95 100644 --- a/roles/pbx/README.rst +++ b/roles/pbx/README.rst @@ -33,6 +33,11 @@ You can monitor the FreePBX service with command:: systemctl status freepbx +Raspberry Pi Zero W Warning +--------------------------- + +Node.js applications like Sugarizer, Node-RED and Asterisk/FreePBX `won't work `_ on Raspberry Pi Zero W (ARM6) if you installed Node.js while on RPi 3 or 3 B+ (ARM7). If absolutely necessary, run "./runrole nodejs" from the Pi Zero W itself, before proceeding to install Sugarizer, Node-RED and/or Asterisk/FreePBX. + Attribution ----------- From 7a378f4f81884d626a98b599767d687221b3494b Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 22:06:34 -0500 Subject: [PATCH 10/28] Update README.rst --- roles/nodered/README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/nodered/README.rst b/roles/nodered/README.rst index bee703c6b..8eb18990e 100644 --- a/roles/nodered/README.rst +++ b/roles/nodered/README.rst @@ -24,6 +24,11 @@ You can monitor the Node-RED service with command:: systemctl status node-red +Raspberry Pi Zero W Warning +--------------------------- + +Node.js applications like Asterisk/FreePBX, Node-RED and Sugarizer `won't work `_ on Raspberry Pi Zero W (ARM6) if you installed Node.js while on RPi 3 or 3 B+ (ARM7). If absolutely necessary, run "./runrole nodejs" from the Pi Zero W itself, before proceeding to install Sugarizer, Node-RED and/or Asterisk/FreePBX. + See Also -------- From 72b257af2f81068a6c1222193dfe32984ddb0339 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 22:13:06 -0500 Subject: [PATCH 11/28] Update README.rst --- roles/pbx/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/pbx/README.rst b/roles/pbx/README.rst index 737e53d95..2697bb7ea 100644 --- a/roles/pbx/README.rst +++ b/roles/pbx/README.rst @@ -36,7 +36,7 @@ You can monitor the FreePBX service with command:: Raspberry Pi Zero W Warning --------------------------- -Node.js applications like Sugarizer, Node-RED and Asterisk/FreePBX `won't work `_ on Raspberry Pi Zero W (ARM6) if you installed Node.js while on RPi 3 or 3 B+ (ARM7). If absolutely necessary, run "./runrole nodejs" from the Pi Zero W itself, before proceeding to install Sugarizer, Node-RED and/or Asterisk/FreePBX. +Node.js applications like Asterisk/FreePBX, Node-RED and Sugarizer `won't work `_ on Raspberry Pi Zero W (ARM6) if you installed Node.js while on RPi 3 or 3 B+ (ARM7). If absolutely necessary, run ``cd /opt/iiab/iiab`` then `./runrole nodejs `_ from the Pi Zero W itself, before proceeding to install Sugarizer, Node-RED and/or Asterisk/FreePBX. Attribution ----------- From c0bc0f8e63d628d4063a3c5b03cb75461645160e Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 22:22:25 -0500 Subject: [PATCH 12/28] Update README.rst --- roles/pbx/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/pbx/README.rst b/roles/pbx/README.rst index 2697bb7ea..81b6445f7 100644 --- a/roles/pbx/README.rst +++ b/roles/pbx/README.rst @@ -36,7 +36,7 @@ You can monitor the FreePBX service with command:: Raspberry Pi Zero W Warning --------------------------- -Node.js applications like Asterisk/FreePBX, Node-RED and Sugarizer `won't work `_ on Raspberry Pi Zero W (ARM6) if you installed Node.js while on RPi 3 or 3 B+ (ARM7). If absolutely necessary, run ``cd /opt/iiab/iiab`` then `./runrole nodejs `_ from the Pi Zero W itself, before proceeding to install Sugarizer, Node-RED and/or Asterisk/FreePBX. +Node.js applications like Asterisk/FreePBX, Node-RED and Sugarizer `won't work `_ on Raspberry Pi Zero W (ARM6) if you installed Node.js while on RPi 3 or 3 B+ (ARM7). If necessary, run ``apt remove nodejs`` then ``cd /opt/iiab/iiab`` then `./runrole nodejs `_ *on the Raspberry Pi Zero W itself* — before proceeding to install Asterisk/FreePBX, Node-RED and/or Sugarizer. Attribution ----------- From 70fbd6784a442a09b8060c075b2b3c0702ad0768 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 12 Feb 2019 22:23:21 -0500 Subject: [PATCH 13/28] Update README.rst --- roles/nodered/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nodered/README.rst b/roles/nodered/README.rst index 8eb18990e..9be464462 100644 --- a/roles/nodered/README.rst +++ b/roles/nodered/README.rst @@ -27,7 +27,7 @@ You can monitor the Node-RED service with command:: Raspberry Pi Zero W Warning --------------------------- -Node.js applications like Asterisk/FreePBX, Node-RED and Sugarizer `won't work `_ on Raspberry Pi Zero W (ARM6) if you installed Node.js while on RPi 3 or 3 B+ (ARM7). If absolutely necessary, run "./runrole nodejs" from the Pi Zero W itself, before proceeding to install Sugarizer, Node-RED and/or Asterisk/FreePBX. +Node.js applications like Asterisk/FreePBX, Node-RED and Sugarizer `won't work `_ on Raspberry Pi Zero W (ARM6) if you installed Node.js while on RPi 3 or 3 B+ (ARM7). If necessary, run ``apt remove nodejs`` then ``cd /opt/iiab/iiab`` then `./runrole nodejs `_ *on the Raspberry Pi Zero W itself* — before proceeding to install Asterisk/FreePBX, Node-RED and/or Sugarizer. See Also -------- From e519410e4cd9b3ccbe64509f2a2bbdb86a90bb19 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 01:02:04 -0500 Subject: [PATCH 14/28] Update and rename node-red.service.j2 to nodered.service.j2 --- .../templates/{node-red.service.j2 => nodered.service.j2} | 6 ++++++ 1 file changed, 6 insertions(+) rename roles/nodered/templates/{node-red.service.j2 => nodered.service.j2} (88%) diff --git a/roles/nodered/templates/node-red.service.j2 b/roles/nodered/templates/nodered.service.j2 similarity index 88% rename from roles/nodered/templates/node-red.service.j2 rename to roles/nodered/templates/nodered.service.j2 index aa35f8d80..547062ee5 100644 --- a/roles/nodered/templates/node-red.service.j2 +++ b/roles/nodered/templates/nodered.service.j2 @@ -19,9 +19,15 @@ SyslogIdentifier=node-red StandardOutput=syslog # non-root user to run as +{% if is_rpi %} +WorkingDirectory=/home/pi/ +User=pi +Group=pi +{% else %} WorkingDirectory=/home/nodered/ User=nodered Group=nodered +{% endif %} [Install] WantedBy=multi-user.target From 4b1d53aa62fd7ab7f11953b336185e70839f8ffe Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 01:04:37 -0500 Subject: [PATCH 15/28] Update main.yml --- roles/nodered/tasks/main.yml | 178 +++++++++++++++++++++++------------ 1 file changed, 119 insertions(+), 59 deletions(-) diff --git a/roles/nodered/tasks/main.yml b/roles/nodered/tasks/main.yml index f02b618a9..9e7cb10f0 100644 --- a/roles/nodered/tasks/main.yml +++ b/roles/nodered/tasks/main.yml @@ -1,80 +1,138 @@ # 2019-01-16: @jvonau's PR #1403 moved installation of Node.js (8.x for now) & # npm to roles/nodejs/tasks/main.yml, triggered by roles/nodered/meta/main.yml -# Too brutal, as this removed customizations on graphical desktop OS's e.g. -# Raspbian Desktop's: +# BRUTAL but ensures consistency across OS's / distros like Raspbian Desktop & +# Ubermix that often include an older version of Node-RED. Brutal, as this +# removes customizations on graphical desktop OS's e.g. Raspbian Desktop's: # 1. Node-RED's icon (Raspberry Menu in top-left -> Programming -> Node-RED) # 2. scripts like {node-red-start, node-red-stop, node-red-log} in /usr/bin # 3. other changes per /usr/bin/update-nodejs-and-nodered summarized at # https://nodered.org/docs/hardware/raspberrypi for example low-memory -# flag --max_old_space_size=256 for unit file (any reason we use 128?) -## BRUTAL but ensures consistency across OS's / distros like Raspbian Desktop & Ubermix that often include an older version of Node-RED -#- name: ASK apt/yum/dnf TO REMOVE PRE-EXISTING Node-RED (IF IT WAS INSTALLED BY OS PKG MANAGER) -# package: -# name: nodered -# state: absent -# when: nodered_install - -#- name: 'npm install node-red packages globally: node-red, node-red-admin, node-red-dashboard' -# shell: npm install -g --unsafe-perm node-red node-red-admin node-red-dashboard -# when: nodered_install - -# To protect pre-installed packages within /usr/lib/node_modules in graphical -# desktop OS's like Raspbian Desktop & Ubermix, we now only install those that -# are missing -- among the 3 below. WARNING: THIS COULD POTENTIALLY LEAD TO -# INCOMPATIBILITIES, IF OS'S /usr/lib/node_modules/node-red GETS OUT OF DATE! - -# /usr/lib/node_modules/node-red is PRE-INSTALLED by Raspbian Desktop, even if -# their package (42MB, 0.19.4) is a bit out of date compared to npm's (55MB, -# 0.19.5) as of 2019-02-12. Among others in /usr/lib/node_modules, pre-placed -# by Raspbian Desktop's apt package 'nodered': -# node-red-contrib-ibm-watson-iot, node-red-contrib-play-audio, -# node-red-node-ledborg, node-red-node-ping, node-red-node-pi-sense-hat -# node-red-node-random, node-red-node-serialport, node-red-node-smooth -- name: Globally 'npm install' pkg 'node-red' if /usr/lib/node_modules/node-red missing (most OS's except for Raspbian Desktop) - command: npm install -g --unsafe-perm node-red - args: - creates: /usr/lib/node_modules/node-red +# flag --max_old_space_size=256 for unit file (we're using 128 on RPi) +# That we'll reconstitute below! +- name: ASK apt/yum/dnf TO REMOVE PRE-EXISTING 'nodered' (IF PREVIOUSLY INSTALLED BY OS PKG MANAGER) + package: + name: nodered + state: absent when: nodered_install -# NOT pre-installed by Raspbian Desktop as of 2019-02-12...so we install this -# on most all OS's: -- name: Globally 'npm install' pkg 'node-red-admin' if /usr/lib/node_modules/node-red-admin missing (most OS's) - command: npm install -g --unsafe-perm node-red-admin - args: - creates: /usr/lib/node_modules/node-red-admin - when: nodered_install +- name: "Globally 'npm install' 3 Node-RED packages: node-red, node-red-admin, node-red-dashboard" + command: npm install -g --unsafe-perm node-red node-red-admin node-red-dashboard + when: nodered_install and internet_available -# NOT pre-installed by Raspbian Desktop as of 2019-02-12...so we install this -# on most all OS's: -- name: Globally 'npm install' pkg 'node-red-dashboard' if /usr/lib/node_modules/node-red-dashboard missing (most OS's) - command: npm install -g --unsafe-perm node-red-dashboard - args: - creates: /usr/lib/node_modules/node-red-dashboard - when: nodered_install +- name: "Globally 'npm install' 8 Node-RED learning examples for RPi: node-red-contrib-ibm-watson-iot, node-red-contrib-play-audio, node-red-node-ledborg, node-red-node-ping, node-red-node-pi-sense-hat, node-red-node-random, node-red-node-serialport, node-red-node-smooth" + command: npm install -g --unsafe-perm node-red-contrib-ibm-watson-iot node-red-contrib-play-audio node-red-node-ledborg node-red-node-ping node-red-node-pi-sense-hat node-red-node-random node-red-node-serialport node-red-node-smooth + when: nodered_install and internet_available and is_rpi -- name: Ensure Linux group 'nodered' exists +# TEST UNNEC ICON/MENU FILE PLACEMENT ON RASPIAN LITE TOO ! +- name: 'Download/Install 4 useful items for RPi: Node-RED icon, start menu item, /etc/logrotate.d/nodered, tweaked "Pi cpu temperature.json"' + get_url: + url: "{{ item.url }}" + dest: "{{ item.dest }}" + with_items: + - url: https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/node-red-icon.svg + dest: /usr/share/icons/hicolor/scalable/apps/node-red-icon.svg + - url: https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/Node-RED.desktop + dest: /usr/share/applications/Node-RED.desktop + - url: https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/nodered.rotate + dest: /etc/logrotate.d/nodered + - url: 'https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/Pi%20cpu%20temperature.json' + dest: '/usr/lib/node_modules/node-red-contrib-ibm-watson-iot/examples/Pi cpu temperature.json' + when: nodered_install and internet_available and is_rpi + +#- name: Replace/Tweak "node-red-contrib-ibm-watson-iot/examples/Pi cpu temperature.json" (rpi) +# command: 'curl -sL -o /usr/lib/node_modules/node-red-contrib-ibm-watson-iot/examples/Pi\ cpu\ temperature.json https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/Pi%20cpu%20temperature.json' +# when: nodered_install and internet_available and is_rpi + +- name: 'Download/Install 4 RPi executables to /usr/bin: node-red-start, node-red-stop, node-red-restart, node-red-log' + get_url: + url: "{{ item }}" + dest: /usr/bin + mode: a+x + with: + - https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/node-red-start + - https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/node-red-stop + - https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/node-red-restart + - https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/node-red-log + when: nodered_install and internet_available and is_rpi + +## To protect pre-installed packages within /usr/lib/node_modules in graphical +## desktop OS's like Raspbian Desktop & Ubermix, we now only install those that +## are missing -- among the 3+8 below. WARNING: THIS COULD POTENTIALLY LEAD TO +## INCOMPATIBILITIES, IF OS'S /usr/lib/node_modules/node-red GETS OUT OF DATE! +# +## /usr/lib/node_modules/node-red is PRE-INSTALLED by Raspbian Desktop, even if +## their package (42MB, 0.19.4) is a bit out of date compared to npm's (55MB, +## 0.19.5) as of 2019-02-12. Among others in /usr/lib/node_modules, pre-placed +## by Raspbian Desktop's apt package 'nodered': +## node-red-contrib-ibm-watson-iot, node-red-contrib-play-audio, +## node-red-node-ledborg, node-red-node-ping, node-red-node-pi-sense-hat +## node-red-node-random, node-red-node-serialport, node-red-node-smooth +#- name: Globally 'npm install' pkg 'node-red' if /usr/lib/node_modules/node-red missing (most OS's except for Raspbian Desktop) +# #command: npm install -g --unsafe-perm node-red +# command: npm install -g --unsafe-perm node-red@latest +# args: +# creates: /usr/lib/node_modules/node-red +# when: nodered_install and internet_available +# +## NOT pre-installed by Raspbian Desktop as of 2019-02-12...so we install this +## on most all OS's: +#- name: Globally 'npm install' pkg 'node-red-admin' if /usr/lib/node_modules/node-red-admin missing (most OS's) +# command: npm install -g --unsafe-perm node-red-admin +# args: +# creates: /usr/lib/node_modules/node-red-admin +# when: nodered_install and internet_available +# +## NOT pre-installed by Raspbian Desktop as of 2019-02-12...so we install this +## on most all OS's: +#- name: Globally 'npm install' pkg 'node-red-dashboard' if /usr/lib/node_modules/node-red-dashboard missing (most OS's) +# command: npm install -g --unsafe-perm node-red-dashboard +# args: +# creates: /usr/lib/node_modules/node-red-dashboard +# when: nodered_install and internet_available + + +- name: Create /home/pi/.node-red/ directory (rpi) + file: + path: /home/pi/.node-red + state: directory + owner: pi + group: pi + mode: 0775 + when: nodered_install and is_rpi + +- name: Install /home/pi/.node-red/settings.js from template, with authentication (rpi) + template: + backup: yes + src: settings.js.j2 + dest: /home/pi/.node-red/settings.js + owner: pi + group: pi + mode: 0755 + when: nodered_install and is_rpi + +- name: Ensure Linux group 'nodered' exists (if not rpi) group: name: nodered state: present - when: nodered_install + when: nodered_install and not is_rpi -- name: Ensure Linux user 'nodered' exists and is added to group 'nodered' +- name: Ensure Linux user 'nodered' exists and is added to group 'nodered' (if not rpi) user: name: nodered group: nodered - when: nodered_install + when: nodered_install and not is_rpi -- name: Create /home/nodered/.node-red/ directory +- name: Ensure directory /home/nodered/.node-red/ exists (if not rpi) file: path: /home/nodered/.node-red state: directory owner: nodered group: nodered mode: 0775 - when: nodered_install + when: nodered_install and not is_rpi -- name: Install /home/nodered/.node-red/settings.js from template, with authentication +- name: Install /home/nodered/.node-red/settings.js from template, with authentication (if not rpi) template: backup: yes src: settings.js.j2 @@ -82,13 +140,14 @@ owner: nodered group: nodered mode: 0755 - when: nodered_install + when: nodered_install and not is_rpi -- name: Install /etc/systemd/system/node-red.service systemd unit file from template + +- name: Install /etc/systemd/system/nodered.service systemd unit file from template template: backup: yes - src: node-red.service.j2 - dest: /etc/systemd/system/node-red.service + src: nodered.service.j2 + dest: /etc/systemd/system/nodered.service owner: root group: root mode: 0666 @@ -132,22 +191,23 @@ state: restarted when: nodered_install -- name: Enable & (Re)start 'node-red' systemd service (if nodered_enabled) +- name: Enable & (Re)start 'nodered' systemd service (if nodered_enabled) systemd: daemon_reload: yes - name: node-red + name: nodered enabled: yes state: restarted when: nodered_enabled -- name: Disable & Stop 'node-red' systemd service (if not nodered_enabled) +- name: Disable & Stop 'nodered' systemd service (if not nodered_enabled) systemd: daemon_reload: yes - name: node-red + name: nodered enabled: no state: stopped when: not nodered_enabled + - name: Add 'nodered' variable values to {{ iiab_ini_file }} ini_file: path: "{{ iiab_ini_file }}" From eb418c37396205819859eddda3ecf4e1e4754c6e Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 01:25:36 -0500 Subject: [PATCH 16/28] Update main.yml --- roles/nodered/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nodered/tasks/main.yml b/roles/nodered/tasks/main.yml index 9e7cb10f0..419989329 100644 --- a/roles/nodered/tasks/main.yml +++ b/roles/nodered/tasks/main.yml @@ -49,7 +49,7 @@ url: "{{ item }}" dest: /usr/bin mode: a+x - with: + with_items: - https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/node-red-start - https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/node-red-stop - https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/node-red-restart From baad9d039eae154855c0ccb03fe66b9dbeb9f92a Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 01:36:12 -0500 Subject: [PATCH 17/28] Update main.yml --- roles/nodered/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/nodered/tasks/main.yml b/roles/nodered/tasks/main.yml index 419989329..47adb0e66 100644 --- a/roles/nodered/tasks/main.yml +++ b/roles/nodered/tasks/main.yml @@ -16,6 +16,12 @@ state: absent when: nodered_install +# 2012-02-13: the 6 RPi stanzas below recreate Raspbian Desktop's Node-RED +# environment, inspired by: +# https://nodered.org/docs/hardware/raspberrypi +# https://github.com/node-red/raspbian-deb-package/blob/master/resources/update-nodejs-and-nodered +# https://github.com/iiab/iiab/pull/1497 + - name: "Globally 'npm install' 3 Node-RED packages: node-red, node-red-admin, node-red-dashboard" command: npm install -g --unsafe-perm node-red node-red-admin node-red-dashboard when: nodered_install and internet_available From 5752811121577d86e2a39c0a5679dee6b120d719 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 02:17:53 -0500 Subject: [PATCH 18/28] Update main.yml --- roles/nodered/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/nodered/defaults/main.yml b/roles/nodered/defaults/main.yml index 58b82a181..4862cbf5e 100644 --- a/roles/nodered/defaults/main.yml +++ b/roles/nodered/defaults/main.yml @@ -13,3 +13,4 @@ nodered_password_hash: $2b$08$oxgvoU9et3deSbXY8UNVTOWHSTQAyEASIal86RHVMqYQJhpPMN # To generate a new password hash, run 'node-red-admin hash-pw' and enter the # new password. Paste the resulting hash above. After Ansible runs, username # and password hash will be placed in: /home/nodered/.node-red/settings.js +# Or...on Raspberry Pi it's placed in: /home/pi/.node-red/settings.js From 34c3358340b7c7dc4daf180b847c7acdb25adb6c Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 03:08:31 -0500 Subject: [PATCH 19/28] Update main.yml --- roles/nodered/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/nodered/defaults/main.yml b/roles/nodered/defaults/main.yml index 4862cbf5e..00155878b 100644 --- a/roles/nodered/defaults/main.yml +++ b/roles/nodered/defaults/main.yml @@ -14,3 +14,4 @@ nodered_password_hash: $2b$08$oxgvoU9et3deSbXY8UNVTOWHSTQAyEASIal86RHVMqYQJhpPMN # new password. Paste the resulting hash above. After Ansible runs, username # and password hash will be placed in: /home/nodered/.node-red/settings.js # Or...on Raspberry Pi it's placed in: /home/pi/.node-red/settings.js +# See http://nodered.org/docs/security.html for details. From 18597f8a5ceb758f69d0ae5e9a0583ccea35b18d Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 03:12:24 -0500 Subject: [PATCH 20/28] Update main.yml --- roles/nodered/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nodered/defaults/main.yml b/roles/nodered/defaults/main.yml index 00155878b..469b9db1d 100644 --- a/roles/nodered/defaults/main.yml +++ b/roles/nodered/defaults/main.yml @@ -5,7 +5,7 @@ # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! -nodered_web_path: nodered # http://box/nodered redirect to http://box:1880 +nodered_web_path: nodered # http://box/nodered reverse proxies http://box:1880 nodered_user: Admin nodered_password: changeme From a0eefd2024c4d49cac6a2d0bd4ae989877e004a4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 03:28:50 -0500 Subject: [PATCH 21/28] Update main.yml --- roles/nodered/defaults/main.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/roles/nodered/defaults/main.yml b/roles/nodered/defaults/main.yml index 469b9db1d..1f02b7d26 100644 --- a/roles/nodered/defaults/main.yml +++ b/roles/nodered/defaults/main.yml @@ -10,8 +10,15 @@ nodered_web_path: nodered # http://box/nodered reverse proxies http://box:1880 nodered_user: Admin nodered_password: changeme nodered_password_hash: $2b$08$oxgvoU9et3deSbXY8UNVTOWHSTQAyEASIal86RHVMqYQJhpPMNz7q -# To generate a new password hash, run 'node-red-admin hash-pw' and enter the -# new password. Paste the resulting hash above. After Ansible runs, username -# and password hash will be placed in: /home/nodered/.node-red/settings.js -# Or...on Raspberry Pi it's placed in: /home/pi/.node-red/settings.js -# See http://nodered.org/docs/security.html for details. + +# TO GENERATE A NEW PASSWORD HASH, run 'node-red-admin hash-pw' and enter +# the new password. Paste the resulting hash as above, but into your own: +# /opt/iiab/iiab/vars/nodered/defaults/main.yml +# +# After Ansible runs, username and password hash are stored in: +# /home/nodered/.node-red/settings.js +# +# Or...on Raspberry Pi they're stored in: +# /home/pi/.node-red/settings.js +# +# See http://nodered.org/docs/security.html for more detail. From 619f28b2d9b9396b3919c2ba12eee67bf33cded8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 03:41:57 -0500 Subject: [PATCH 22/28] Update main.yml --- roles/nodered/defaults/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/nodered/defaults/main.yml b/roles/nodered/defaults/main.yml index 1f02b7d26..ab61daafe 100644 --- a/roles/nodered/defaults/main.yml +++ b/roles/nodered/defaults/main.yml @@ -8,14 +8,15 @@ nodered_web_path: nodered # http://box/nodered reverse proxies http://box:1880 nodered_user: Admin -nodered_password: changeme +nodered_password: changeme # REMOVE THIS PASSWORD REMINDER LINE AS NECESSARY nodered_password_hash: $2b$08$oxgvoU9et3deSbXY8UNVTOWHSTQAyEASIal86RHVMqYQJhpPMNz7q # TO GENERATE A NEW PASSWORD HASH, run 'node-red-admin hash-pw' and enter # the new password. Paste the resulting hash as above, but into your own: # /opt/iiab/iiab/vars/nodered/defaults/main.yml # -# After Ansible runs, username and password hash are stored in: +# After IIAB's installer runs (or "cd /opt/iiab/iiab" then "./runrole nodered") +# username and password hash are stored in: # /home/nodered/.node-red/settings.js # # Or...on Raspberry Pi they're stored in: From 5611915cc64fa9e879e418df048eda13ea60a986 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 03:43:23 -0500 Subject: [PATCH 23/28] Update README.rst --- roles/nodered/README.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/nodered/README.rst b/roles/nodered/README.rst index 9be464462..834647af1 100644 --- a/roles/nodered/README.rst +++ b/roles/nodered/README.rst @@ -20,9 +20,11 @@ Username: ``Admin`` Password: ``changeme`` +To change this password, please see: `roles/nodered/defaults/main.yml `_ + You can monitor the Node-RED service with command:: - systemctl status node-red + systemctl status nodered Raspberry Pi Zero W Warning --------------------------- From bd3b1836e84dab3e47e61bef2b49f69d4610d120 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 04:14:57 -0500 Subject: [PATCH 24/28] Update main.yml --- roles/nodered/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/nodered/tasks/main.yml b/roles/nodered/tasks/main.yml index 47adb0e66..a85c8d839 100644 --- a/roles/nodered/tasks/main.yml +++ b/roles/nodered/tasks/main.yml @@ -24,6 +24,8 @@ - name: "Globally 'npm install' 3 Node-RED packages: node-red, node-red-admin, node-red-dashboard" command: npm install -g --unsafe-perm node-red node-red-admin node-red-dashboard + #command: npm install -g --unsafe-perm node-red@latest node-red-admin@latest node-red-dashboard@latest + # Above "@latest" is recommended by https://nodered.org/docs/hardware/raspberrypi (SHOULD WE CONSIDER?) when: nodered_install and internet_available - name: "Globally 'npm install' 8 Node-RED learning examples for RPi: node-red-contrib-ibm-watson-iot, node-red-contrib-play-audio, node-red-node-ledborg, node-red-node-ping, node-red-node-pi-sense-hat, node-red-node-random, node-red-node-serialport, node-red-node-smooth" From 299940e461a7a3f64e306e8e32e65c126310e5d3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 04:54:03 -0500 Subject: [PATCH 25/28] Update README.rst --- roles/nodered/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nodered/README.rst b/roles/nodered/README.rst index 834647af1..cadcca326 100644 --- a/roles/nodered/README.rst +++ b/roles/nodered/README.rst @@ -34,4 +34,4 @@ Node.js applications like Asterisk/FreePBX, Node-RED and Sugarizer `won't work < See Also -------- -`Mosquitto (MQTT) <../mosquitto/README.rst>`_ +`Mosquitto (MQTT) <../mosquitto#mosquitto-readme>`_ From 6e268880a3a9d8bdd4a1f89ba901693dd3322ed4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 13 Feb 2019 04:55:31 -0500 Subject: [PATCH 26/28] Update README.rst --- roles/mosquitto/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mosquitto/README.rst b/roles/mosquitto/README.rst index 2f9e5a728..098ff2831 100644 --- a/roles/mosquitto/README.rst +++ b/roles/mosquitto/README.rst @@ -27,4 +27,4 @@ You can monitor it with command:: See Also -------- -`Node-RED <../nodered/README.rst>`_ +`Node-RED <../nodered#node-red-readme>`_ From 49da1ee1bbe80bb62e71b8f113f7d546c63e863f Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 07:07:18 -0500 Subject: [PATCH 27/28] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6e75e8ffe..969ff23a8 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Internet-in-a-Box (IIAB) -Welcome to the Git repository for Internet-in-a-Box (IIAB). Internet-in-a-Box (IIAB) is a small, inexpensive device which provides essential Internet resources (Wikipedia, OpenStreetMap, Khan Academy and others) without any Internet connection. +Welcome to the Git repository for Internet-in-a-Box (IIAB). IIAB is a small and inexpensive device which provides essential Internet resources (Wikipedia, OpenStreetMap, Khan Academy and others) without any Internet connection. -You are encouraged to customize this local content hotspot or server with the best of the world’s Free Knowledge — to suit your own region, your school, your medical clinic, your library and/or for your very own family. +You're encouraged to DIY (customize) this local content hotspot or server with the best of the world’s Free Knowledge — to Create the digital library needed by your school, your medical clinic, your region and/or your very own family. FYI this community product is enabled by professional volunteers working side-by-side with schools, clinics and libraries around the world. Thank you for being a part of our grassroots technology movement! From 72bc55bea62d67ed452b1b05ad342f25242d8172 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 07:57:18 -0500 Subject: [PATCH 28/28] Update README.md --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 969ff23a8..c611272cc 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,14 @@ # Internet-in-a-Box (IIAB) -Welcome to the Git repository for Internet-in-a-Box (IIAB). IIAB is a small and inexpensive device which provides essential Internet resources (Wikipedia, OpenStreetMap, Khan Academy and others) without any Internet connection. +Welcome to the GitHub repository for Internet-in-a-Box (IIAB). IIAB is a small and inexpensive device which provides essential Internet resources (Wikipedia, OpenStreetMap, Khan Academy and others) *usable even when offline!*. -You're encouraged to DIY (customize) this local content hotspot or server with the best of the world’s Free Knowledge — to Create the digital library needed by your school, your medical clinic, your region and/or your very own family. +Create the digital library needed by your school, your medical clinic, your region and/or your very own family — accessible with any nearby smartphone, tablet or laptop. -FYI this community product is enabled by professional volunteers working side-by-side with schools, clinics and libraries around the world. Thank you for being a part of our grassroots technology movement! +Internet-in-a-Box provides you the tools to DIY (download and customize) a local content hotspot or server, with the very best of the World’s Free Knowledge. + +Schools can also choose among [30 powerful educational apps](http://wiki.laptop.org/go/IIAB/FAQ#What_services_.28IIAB_apps.29_are_suggested_during_installation.3F) for teachers and students, optionally with a complete LMS (learning management system). + +FYI this community product is enabled by professional volunteers working side-by-side with schools, clinics and libraries around the world. *Thank you for being a part of our grassroots technology movement!* ## Installation