From 0dfa33255b0251f242e33c478136352fcf880f98 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 09:30:39 -0500 Subject: [PATCH 01/26] Update main.yml --- roles/nodered/defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/nodered/defaults/main.yml b/roles/nodered/defaults/main.yml index ab61daafe..02456eb6f 100644 --- a/roles/nodered/defaults/main.yml +++ b/roles/nodered/defaults/main.yml @@ -5,7 +5,8 @@ # 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 reverse proxies http://box:1880 +# For http://box/nodered reverse proxy of http://box:1880/nodered +nodered_web_path: nodered nodered_user: Admin nodered_password: changeme # REMOVE THIS PASSWORD REMINDER LINE AS NECESSARY From 3976538eb83c7d409fcaa967aa8e4bff7b144bba Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 09:31:13 -0500 Subject: [PATCH 02/26] 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 cadcca326..549e4f1e2 100644 --- a/roles/nodered/README.rst +++ b/roles/nodered/README.rst @@ -20,7 +20,7 @@ Username: ``Admin`` Password: ``changeme`` -To change this password, please see: `roles/nodered/defaults/main.yml `_ +To change this password, please see: `roles/nodered/defaults/main.yml `_ You can monitor the Node-RED service with command:: From 54d4adc45076b077aeb3b9a1f301be0f9def5d76 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 09:33:20 -0500 Subject: [PATCH 03/26] Update local_vars_big.yml --- vars/local_vars_big.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index eec083954..ba6614808 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -196,9 +196,9 @@ nextcloud_install: True nextcloud_enabled: True # A full-featured PBX (for rural telephony, etc) based on Asterisk and FreePBX. -# Should work on Ubuntu 18.04, Debian 9 and Raspbian/RPi 3. Uses Node.js 10.x -pbx_install: True -pbx_enabled: True +# Works on Ubuntu 18.04, Debian 9. Experimental on Rasp/RPi 3. Uses Node.js 10.x +pbx_install: False +pbx_enabled: False asterisk_chan_dongle: False # If using WordPress intensively, set apache_high_php_limits in 3-BASE-SERVER From 5b5cd7ba1e934a36a5ba8e6bc75be07d9dacdef7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 09:34:07 -0500 Subject: [PATCH 04/26] Update default_vars.yml --- 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 325ac21fa..0d38cde85 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -297,7 +297,7 @@ nextcloud_install: False nextcloud_enabled: False # A full-featured PBX (for rural telephony, etc) based on Asterisk and FreePBX. -# Should work on Ubuntu 18.04, Debian 9 and Raspbian/RPi 3. Uses Node.js 10.x +# Works on Ubuntu 18.04, Debian 9. Experimental on Rasp/RPi 3. Uses Node.js 10.x pbx_install: False pbx_enabled: False asterisk_chan_dongle: False From ec99e67b9c139f22147b6509a316a7fbf0ae92da Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 09:34:23 -0500 Subject: [PATCH 05/26] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 18e2d905b..fa40d5ca0 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -196,7 +196,7 @@ nextcloud_install: True nextcloud_enabled: True # A full-featured PBX (for rural telephony, etc) based on Asterisk and FreePBX. -# Should work on Ubuntu 18.04, Debian 9 and Raspbian/RPi 3. Uses Node.js 10.x +# Works on Ubuntu 18.04, Debian 9. Experimental on Rasp/RPi 3. Uses Node.js 10.x pbx_install: False pbx_enabled: False asterisk_chan_dongle: False From fa156f8995e62121ec4d70cd5f5d2aa99fdfbf2f Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 09:34:44 -0500 Subject: [PATCH 06/26] Update local_vars_min.yml --- vars/local_vars_min.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index b15ceccff..bbab412b4 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -196,7 +196,7 @@ nextcloud_install: False nextcloud_enabled: False # A full-featured PBX (for rural telephony, etc) based on Asterisk and FreePBX. -# Should work on Ubuntu 18.04, Debian 9 and Raspbian/RPi 3. Uses Node.js 10.x +# Works on Ubuntu 18.04, Debian 9. Experimental on Rasp/RPi 3. Uses Node.js 10.x pbx_install: False pbx_enabled: False asterisk_chan_dongle: False From 182ecc9a2fef66f44612d04ae7e1358fd7be43ae Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 09:45:38 -0500 Subject: [PATCH 07/26] Update README.rst --- roles/pbx/README.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/pbx/README.rst b/roles/pbx/README.rst index 81b6445f7..e3da1865c 100644 --- a/roles/pbx/README.rst +++ b/roles/pbx/README.rst @@ -33,6 +33,13 @@ You can monitor the FreePBX service with command:: systemctl status freepbx +Raspberry Pi Known Issue +------------------------ + +As of 2019-02-14, "systemctl restart freepbx" fails more than 50% of the time when run on a BIG-sized install of IIAB 6.7. + +It is possible that FreePBX restarts much more reliably when run on a MIN-sized install of IIAB? Please `contact us `_ if you can assist here in any way: `#1493 `_ + Raspberry Pi Zero W Warning --------------------------- From 624c769e0d62ca0da1522383380a0be6af5f0964 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 09:47:24 -0500 Subject: [PATCH 08/26] 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 e3da1865c..6c8724293 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 Known Issue ------------------------ -As of 2019-02-14, "systemctl restart freepbx" fails more than 50% of the time when run on a BIG-sized install of IIAB 6.7. +As of 2019-02-14, "systemctl restart freepbx" fails more than 50% of the time when run on a `BIG-sized `_ install of IIAB 6.7 on RPi 3 or RPi 3 B+. It is possible that FreePBX restarts much more reliably when run on a MIN-sized install of IIAB? Please `contact us `_ if you can assist here in any way: `#1493 `_ From ebdddf5b3e88e166af55d50254248450f159c799 Mon Sep 17 00:00:00 2001 From: Anish Mangal Date: Thu, 14 Feb 2019 21:00:18 +0530 Subject: [PATCH 09/26] Move nodered_web_path to default_vars, part 1 --- vars/default_vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 0d38cde85..a760af4b3 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -292,6 +292,7 @@ nodejs_version: 10.x # was 8.x until 2019-02-02 nodered_install: False nodered_enabled: False nodered_port: 1880 +nodered_web_path: nodered nextcloud_install: False nextcloud_enabled: False From f9e248dc67d9a7c00d315c801cfc2842383f3c35 Mon Sep 17 00:00:00 2001 From: Anish Mangal Date: Thu, 14 Feb 2019 21:00:52 +0530 Subject: [PATCH 10/26] Move nodered_web_path to default_vars, part 2 --- roles/nodered/defaults/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/nodered/defaults/main.yml b/roles/nodered/defaults/main.yml index 02456eb6f..cd1c35485 100644 --- a/roles/nodered/defaults/main.yml +++ b/roles/nodered/defaults/main.yml @@ -1,13 +1,12 @@ # nodered_install: False # nodered_enabled: False # nodered_port: 1880 +# For http://box/nodered reverse proxy of http://box:1880/nodered +# nodered_web_path: nodered # 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! -# For http://box/nodered reverse proxy of http://box:1880/nodered -nodered_web_path: nodered - nodered_user: Admin nodered_password: changeme # REMOVE THIS PASSWORD REMINDER LINE AS NECESSARY nodered_password_hash: $2b$08$oxgvoU9et3deSbXY8UNVTOWHSTQAyEASIal86RHVMqYQJhpPMNz7q From a9b161c5b9c2444d67280c4e44160fd14cc8b1a2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 10:35:00 -0500 Subject: [PATCH 11/26] 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 cd1c35485..2bbe417aa 100644 --- a/roles/nodered/defaults/main.yml +++ b/roles/nodered/defaults/main.yml @@ -1,6 +1,7 @@ # nodered_install: False # nodered_enabled: False # nodered_port: 1880 + # For http://box/nodered reverse proxy of http://box:1880/nodered # nodered_web_path: nodered From b69a509da8a90d0fcf0c000e70cec00f4dd5eea0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 14 Feb 2019 13:01:46 -0500 Subject: [PATCH 12/26] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c611272cc..088e2aac7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Internet-in-a-Box (IIAB) -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!*. +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!* 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. From 270d7449fd23de4a4dde2cca9f7cabdfb4156cbf Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 14 Feb 2019 20:09:16 -0800 Subject: [PATCH 13/26] iiab-banner6.png moved --- roles/captive-portal/templates/capture-wsgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/captive-portal/templates/capture-wsgi.py b/roles/captive-portal/templates/capture-wsgi.py index 37352603f..a15b596c0 100755 --- a/roles/captive-portal/templates/capture-wsgi.py +++ b/roles/captive-portal/templates/capture-wsgi.py @@ -340,7 +340,7 @@ def banner(environ, start_response): status = '200 OK' headers = [('Content-type', 'image/png')] start_response(status, headers) - image = open("%s/iiab-menu/menu-files/images/iiab_banner6.png"%doc_root, "rb").read() + image = open("%s/js-menu/menu-files/images/iiab_banner6.png"%doc_root, "rb").read() return [image] def bootstrap(environ, start_response): From e7fb41877a9fb5ac77105f9789e3bb7c0031de00 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 14 Feb 2019 21:10:46 -0800 Subject: [PATCH 14/26] test for uninitialized system_version was flawed --- roles/captive-portal/templates/capture-wsgi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/captive-portal/templates/capture-wsgi.py b/roles/captive-portal/templates/capture-wsgi.py index a15b596c0..ad16f2e98 100755 --- a/roles/captive-portal/templates/capture-wsgi.py +++ b/roles/captive-portal/templates/capture-wsgi.py @@ -228,8 +228,8 @@ def android(environ, start_response): else: ip = environ['REMOTE_ADDR'].strip() system,system_version = platform_info(ip) - if not system_version: - put_302(environ, start_response) + if system_version is None: + return put_302(environ, start_response) if system_version[0:1] < '6': logger.debug("system < 6:%s"%system_version) location = '/android_splash' From dfbf2589f763c7dcc4f183b5cab38ddfa4d0b370 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 17 Feb 2019 18:24:31 -0500 Subject: [PATCH 15/26] Update README.rst --- roles/elgg/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/elgg/README.rst b/roles/elgg/README.rst index 4eac3ea7d..fc5fb12a2 100644 --- a/roles/elgg/README.rst +++ b/roles/elgg/README.rst @@ -52,6 +52,6 @@ There are a number of seemingly similar usernames and passwords in this installa More Tips & Tricks ------------------ -If you're online, please see "Elgg Administration: What tips & tricks exist? " at: http://FAQ.IIAB.IO +If you're online, please see "Elgg Administration: What tips & tricks exist?" at: http://FAQ.IIAB.IO If you're offline, Internet-in-a-Box's FAQ (Frequently Asked Questions) is here: http://box/info From ea8c3021028de585ae6dac56f2d36269db45588a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 21 Feb 2019 08:12:25 -0500 Subject: [PATCH 16/26] Lokole 0.1.36 -> 0.1.38 --- roles/lokole/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/lokole/defaults/main.yml b/roles/lokole/defaults/main.yml index f19b68b05..91271f72a 100644 --- a/roles/lokole/defaults/main.yml +++ b/roles/lokole/defaults/main.yml @@ -5,7 +5,7 @@ # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! # Info needed to install Lokole -lokole_version: "0.1.36" +lokole_version: "0.1.38" lokole_admin_user: admin # lowercase seems nec here (even though uppercase Admin/changeme is IIAB's OOB recommendation!) lokole_admin_password: changeme lokole_install_path: "{{ content_base }}/lokole" # /library/lokole From 9ef4ee2b8adbc550fef83df13ce15cd3f5c23261 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 21 Feb 2019 17:21:48 -0500 Subject: [PATCH 17/26] Ansible 2.6.13 -> 2.6.14 --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index d46604b75..6d38c5598 100755 --- a/iiab-install +++ b/iiab-install @@ -10,7 +10,7 @@ CWD=`pwd` OS=`grep ^ID= /etc/*release|cut -d= -f2` OS=${OS//\"/} MIN_RPI_KERN=4.9.59-v7+ -MIN_ANSIBLE_VER=2.6.13 +MIN_ANSIBLE_VER=2.6.14 if [ ! -f /etc/iiab/local_vars.yml ]; then From 84b715f4fbc7878f227d63ea302775a9e525113a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 21 Feb 2019 17:22:07 -0500 Subject: [PATCH 18/26] Ansible 2.7.7 -> 2.7.8 --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index e08178100..047219d52 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.7.7" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.7.8" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive From f13444d8481cd46518f281e9819cee62a2c32483 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 21 Feb 2019 17:22:20 -0500 Subject: [PATCH 19/26] Ansible 2.7.7 -> 2.7.8 --- scripts/ansible-2.6.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index 74c11cde0..baae8e3b0 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.7.7" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.7.8" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive From e6c85f2a51ef1fe2af371184a2b0d46630ccca08 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 21 Feb 2019 17:22:34 -0500 Subject: [PATCH 20/26] Ansible 2.7.7 -> 2.7.8 --- scripts/ansible-2.7.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.7.x b/scripts/ansible-2.7.x index 01ca3dcf8..5942c50a9 100755 --- a/scripts/ansible-2.7.x +++ b/scripts/ansible-2.7.x @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.7.7" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.7.8" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive From 262de1ed988c790a99e2ba791260393567a72a9b Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 22 Feb 2019 11:26:08 -0500 Subject: [PATCH 21/26] Update README.md --- README.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 088e2aac7..c0040316d 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Internet-in-a-Box (IIAB) -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!* +Welcome to the GitHub repository for [Internet-in-a-Box (IIAB)](http://internet-in-a-box.org). IIAB is a small and inexpensive device which provides essential Internet resources (Wikipedia, OpenStreetMap, Khan Academy and others) *usable even when offline!* 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. -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. +Internet-in-a-Box provides you the tools to DIY (download and customize) a local content hotspot or server, using the Internet's crown jewels and 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). @@ -18,6 +18,10 @@ Please see "What are the best places for community support?" at http://FAQ.IIAB. The [Installation](https://github.com/iiab/iiab/wiki/IIAB-Installation) wiki page has more intricate details e.g. if you're trying to install Internet-in-a-Box (IIAB) on a [different platform](https://github.com/iiab/iiab/wiki/IIAB-Platforms) that has not yet been tried. +Then you [add content](https://github.com/iiab/iiab/wiki/IIAB-Installation#add-content), which can of course take time when downloading multi-gigabyte Content Packs! + +Finally, you can [customize your Internet-in-a-Box home page](http://wiki.laptop.org/go/IIAB/FAQ#How_do_I_customize_my_Internet-in-a-Box_home_page.3F) (typically http://box or http://box.lan) using our drag-and-drop Admin Console (http://box/admin) — to arrange Content Packs and IIAB Apps (services) for your local community's needs. + #### Built with Ansible FYI we use [Ansible](http://wiki.laptop.org/go/IIAB/FAQ#What_is_Ansible_and_what_version_should_I_use.3F) as the underlying technology to install, deploy, configure and manage the various software components. @@ -26,16 +30,16 @@ FYI we use [Ansible](http://wiki.laptop.org/go/IIAB/FAQ#What_is_Ansible_and_what We greatly welcome contributions from educators, librarians *and* IT/UX/QA people of all kinds! -Please see "How can I help?" at http://FAQ.IIAB.IO +Please see "How can I help?" at: http://FAQ.IIAB.IO Check out our [Contributors Guide](https://github.com/iiab/iiab/wiki/IIAB-Contributors-Guide) to learn more about contributing directly to Internet-in-a-Box (IIAB) software and its open community architecture for education. *Thank you for helping us enable offline access to the Internet's open knowledge jewels, as well as "Sneakernet-of-Alexandria" distribution of local/indigenous content, when mass media channels do not serve grassroots voices.* -## Versioning +## Versions -Pre-releases of Internet-in-a-Box (IIAB) are available from http://download.iiab.io — click on the highest version number and then launch the 1-line installer. +Pre-releases of Internet-in-a-Box (IIAB) undergo continuous QA / continuous deployment and are strongly recommended. Install our latest pre-release using the 1-line installer at: http://download.iiab.io -You can also track the latest Internet-in-a-Box (IIAB) [official releases here](https://github.com/iiab/iiab/releases). +You can also consider the official releases at: [github.com/iiab/iiab/releases](https://github.com/iiab/iiab/releases) -Finally older versions are also available, from [github.com/xsce](http://github.com/xsce) and [schoolserver.org](http://schoolserver.org). +Finally, older versions are here: [github.com/xsce](http://github.com/xsce), [schoolserver.org](http://schoolserver.org) From 059cfc8adcd023ec50d8ca1e1844b35dc072ae04 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 22 Feb 2019 11:27:04 -0500 Subject: [PATCH 22/26] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c0040316d..3643f98a6 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,9 @@ Check out our [Contributors Guide](https://github.com/iiab/iiab/wiki/IIAB-Contri ## Versions -Pre-releases of Internet-in-a-Box (IIAB) undergo continuous QA / continuous deployment and are strongly recommended. Install our latest pre-release using the 1-line installer at: http://download.iiab.io +Pre-releases of Internet-in-a-Box (IIAB) undergo continuous QA / continuous deployment and are strongly recommended. + +Install our latest pre-release using the 1-line installer at: http://download.iiab.io You can also consider the official releases at: [github.com/iiab/iiab/releases](https://github.com/iiab/iiab/releases) From db045629035ffca873ea4c36d18a9cbd574cc734 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 22 Feb 2019 15:56:26 -0500 Subject: [PATCH 23/26] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3643f98a6..b91f67ebd 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Internet-in-a-Box provides you the tools to DIY (download and customize) a local 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!* +FYI this community product is enabled by professional volunteers working [side-by-side](http://wiki.laptop.org/go/IIAB/FAQ#What_are_the_best_places_for_community_support.3F) with schools, clinics and libraries around the world. *Thank you for being a part of our grassroots technology movement!* ## Installation @@ -30,7 +30,7 @@ FYI we use [Ansible](http://wiki.laptop.org/go/IIAB/FAQ#What_is_Ansible_and_what We greatly welcome contributions from educators, librarians *and* IT/UX/QA people of all kinds! -Please see "How can I help?" at: http://FAQ.IIAB.IO +Please see "[How can I help?](http://wiki.laptop.org/go/IIAB/FAQ#How_can_I_help.3F)" at: http://FAQ.IIAB.IO Check out our [Contributors Guide](https://github.com/iiab/iiab/wiki/IIAB-Contributors-Guide) to learn more about contributing directly to Internet-in-a-Box (IIAB) software and its open community architecture for education. From c401763005313e5031cd541bc7c310bd1746e97d Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 22 Feb 2019 20:57:37 -0800 Subject: [PATCH 24/26] seems to work on win7 --- .../captive-portal/templates/capture-wsgi.py | 28 ++----------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/roles/captive-portal/templates/capture-wsgi.py b/roles/captive-portal/templates/capture-wsgi.py index ad16f2e98..4dc61ba43 100755 --- a/roles/captive-portal/templates/capture-wsgi.py +++ b/roles/captive-portal/templates/capture-wsgi.py @@ -177,27 +177,7 @@ def set_lasttimestamp(ip): conn.commit() # ################### Action routines based on OS ################3 -def microsoft_splash(environ,start_response): - en_txt={ 'message':"Click on the button to go to the IIAB home page",\ - "FQDN": fully_qualified_domain_name, \ - 'btn1':"GO TO IIAB HOME PAGE",'doc_root':get_iiab_env("WWWROOT")} - es_txt={ 'message':"Haga clic en el botón para ir a la página de inicio de IIAB",\ - "FQDN": fully_qualified_domain_name, \ - 'btn1':"IIAB",'doc_root':get_iiab_env("WWWROOT")} - txt = en_txt - if lang == "en": - txt = en_txt - elif lang == "es": - txt = es_txt - response_body = str(j2_env.get_template("simple.template").render(**txt)) - status = '200 OK' - response_headers = [('Content-type','text/html'), - ('Content-Length',str(len(response_body)))] - start_response(status, response_headers) - return [response_body] - def microsoft(environ,start_response): - global MICROSOFT_TRIGGERED # firefox -- seems both mac and Windows use it agent = environ.get('HTTP_USER_AGENT','default_agent') if agent.startswith('Mozilla'): @@ -205,7 +185,7 @@ def microsoft(environ,start_response): logger.debug("sending microsoft redirect") response_body = "" status = '302 Moved Temporarily' - response_headers = [('Location','/microsoft_splash'), + response_headers = [('Location','http://box.lan/home'), ('Content-type','text/html'), ('Content-Length',str(len(response_body)))] start_response(status, response_headers) @@ -542,10 +522,6 @@ def application (environ, start_response): return android(environ, start_response) # microsoft - if environ['PATH_INFO'] == "/microsoft_splash": - return microsoft_splash(environ, start_response) - if environ['PATH_INFO'] == "/connecttest.txt" and not is_inactive(ip): - return microsoft_connect(environ, start_response) if environ['HTTP_HOST'] == "ipv6.msftncsi.com" or\ environ['HTTP_HOST'] == "detectportal.firefox.com" or\ environ['HTTP_HOST'] == "ipv6.msftncsi.com.edgesuite.net" or\ @@ -557,7 +533,7 @@ def application (environ, start_response): environ['HTTP_HOST'] == "teredo.ipv6.microsoft.com.nsatc.net": return microsoft(environ, start_response) - logger.debug("executing the default 204 response. [%s"%data) + logger.debug("executing the default 302 response. [%s"%data) return put_302(environ,start_response) # Instantiate the server From 4f2a710f0078853a5119347d2673f2424550434d Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 24 Feb 2019 15:56:05 -0500 Subject: [PATCH 25/26] 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 a85c8d839..8b37c6b41 100644 --- a/roles/nodered/tasks/main.yml +++ b/roles/nodered/tasks/main.yml @@ -192,7 +192,7 @@ name: proxy_wstunnel when: nodered_install -- name: Restart Apache service ({{ apache_service }}) to enable/disable http://box/nodered (not just http://box:{{ nodered_port }}) +- name: Restart Apache service ({{ apache_service }}) to enable/disable http://box/nodered (not just http://box:{{ nodered_port }}/nodered) systemd: #daemon_reload: yes name: "{{ apache_service }}" # httpd or apache2 From a630e6dcd00fa0d3289c6b449a8697a9cae4fbe7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 24 Feb 2019 15:57:17 -0500 Subject: [PATCH 26/26] 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 549e4f1e2..20ce9603f 100644 --- a/roles/nodered/README.rst +++ b/roles/nodered/README.rst @@ -14,7 +14,7 @@ Prior to installing IIAB, make sure your `/etc/iiab/local_vars.yml