From 76b426f5deb7cd3a35c772601352757ec1ac910b Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 10 Oct 2018 12:49:20 -0400 Subject: [PATCH 1/9] Update README.md --- README.md | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3de62a82f..552a4ad59 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,35 @@ # Internet-in-a-Box (IIAB) -Welcome to the Git repository of the Internet-in-a-Box (IIAB) project. This is a community-based project developed and supported by volunteers from around the world. The Internet-in-a-Box (IIAB) is small, inexpensive device which provides essential Internet resources (like Wikipedia, OpenStreetMap, Khan Academy and others) without any Internet connection. It provides a local content server of the world’s Free Knowledge. - -The older version of this repository is at [github.com/xsce](http://github.com/xsce). We are using [Ansible](https://www.ansible.com) as the underlying technology to install, deploy, configure and manage the various software components. +Welcome to the Git repository for Internet-in-a-Box (IIAB). This community-based project is enabled by professional volunteers around the world. Internet-in-a-Box (IIAB) is a small, inexpensive device which provides essential Internet resources (like 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 region, your school, your medical establishment, your library — or for your very own family. ## Installation -Please read the [Installation](https://github.com/iiab/iiab/wiki/IIAB-Installation) wiki page for details about installation of Internet-in-a-Box (IIAB). +Please read the [Installation](https://github.com/iiab/iiab/wiki/IIAB-Installation) wiki page for details on installing of Internet-in-a-Box (IIAB). -## Built With +Or, to dive right in, our "1-line installer" is available off of http://download.iiab.io — it's generally best to click on the highest version number. -* [Ansible](http://www.ansible.com) +Please see "What are the best places for community support?" at http://FAQ.IIAB.IO which many answers to help you along the way, in designing the digital knowledge hotspot most suitable for your own community. + +#### Ansible IT Automation + +FYI we are using [Ansible](https://www.ansible.com) as the underlying technology to install, deploy, configure and manage the various software components. ## Contributing -Please read our [Contributors Guide](https://github.com/iiab/iiab/wiki/IIAB-Contributors-Guide) to learn more about contributing to Internet-in-a-Box (IIAB) repository. +We greatly welcome contributions from educators, librarians *and* IT/UX/QA people of all kind! + +Please see "How can I help?" at http://FAQ.IIAB.IO + +Check out 2017's [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, where mass media channels are not serving grassroots voices.* ## Versioning -You can track the latest Internet-in-a-Box (IIAB) [releases here](https://github.com/iiab/iiab/releases). +Pre-releases of Internet-in-a-Box (IIAB) are available from http://download.iiab.io — click on the highest version number. + +You can also track the latest Internet-in-a-Box (IIAB) [official releases here](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). From 32b133ac91184cb7cbbdf6ac79b601db259bafc1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 10 Oct 2018 13:57:51 -0400 Subject: [PATCH 2/9] @aidan-fitz recommendations --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 552a4ad59..7dc6a61b5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Internet-in-a-Box (IIAB) -Welcome to the Git repository for Internet-in-a-Box (IIAB). This community-based project is enabled by professional volunteers around the world. Internet-in-a-Box (IIAB) is a small, inexpensive device which provides essential Internet resources (like Wikipedia, OpenStreetMap, Khan Academy and others) without any Internet connection. +Welcome to the Git repository for Internet-in-a-Box (IIAB). This community-based project is enabled by professional volunteers around the world. 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. You are encouraged to customize this local content hotspot or server with the best of the world’s Free Knowledge — to suit your region, your school, your medical establishment, your library — or for your very own family. @@ -12,17 +12,17 @@ Or, to dive right in, our "1-line installer" is available off of http://download Please see "What are the best places for community support?" at http://FAQ.IIAB.IO which many answers to help you along the way, in designing the digital knowledge hotspot most suitable for your own community. -#### Ansible IT Automation +#### Built with Ansible FYI we are using [Ansible](https://www.ansible.com) as the underlying technology to install, deploy, configure and manage the various software components. ## Contributing -We greatly welcome contributions from educators, librarians *and* IT/UX/QA people of all kind! +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 -Check out 2017's [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. +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, where mass media channels are not serving grassroots voices.* From dbb01685402158d95ad08a5df5b02b25f361824c Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 10 Oct 2018 16:55:17 -0400 Subject: [PATCH 3/9] Update README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7dc6a61b5..3b6f644ee 100644 --- a/README.md +++ b/README.md @@ -2,19 +2,19 @@ Welcome to the Git repository for Internet-in-a-Box (IIAB). This community-based project is enabled by professional volunteers around the world. 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. -You are encouraged to customize this local content hotspot or server with the best of the world’s Free Knowledge — to suit your region, your school, your medical establishment, your library — or for your very own family. +You are encouraged to customize this local content hotspot or server with the best of the world’s Free Knowledge — to suit your region, your school, your medical clinic, your library — and/or for your very own family. ## Installation -Please read the [Installation](https://github.com/iiab/iiab/wiki/IIAB-Installation) wiki page for details on installing of Internet-in-a-Box (IIAB). +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. -Or, to dive right in, our "1-line installer" is available off of http://download.iiab.io — it's generally best to click on the highest version number. +Please see "What are the best places for community support?" at http://FAQ.IIAB.IO which has 40+ questions and answers to help you along the way, as you put together the digital knowledge hotspot most suitable for your own community. -Please see "What are the best places for community support?" at http://FAQ.IIAB.IO which many answers to help you along the way, in designing the digital knowledge hotspot most suitable for your own community. +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 Linux distribution that has not yet been tried. #### Built with Ansible -FYI we are using [Ansible](https://www.ansible.com) as the underlying technology to install, deploy, configure and manage the various software components. +FYI we use [Ansible](https://www.ansible.com) as the underlying technology to install, deploy, configure and manage the various software components. ## Contributing @@ -24,11 +24,11 @@ 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, where mass media channels are not serving grassroots voices.* +*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, where mass media channels do not serve grassroots voices.* ## Versioning -Pre-releases of Internet-in-a-Box (IIAB) are available from http://download.iiab.io — click on the highest version number. +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. You can also track the latest Internet-in-a-Box (IIAB) [official releases here](https://github.com/iiab/iiab/releases). From 029905aaeb49b6f9782dcd21f2b0686808f2f760 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 10 Oct 2018 20:01:41 -0400 Subject: [PATCH 4/9] Update README.md --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3b6f644ee..688edf5e9 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ # Internet-in-a-Box (IIAB) -Welcome to the Git repository for Internet-in-a-Box (IIAB). This community-based project is enabled by professional volunteers around the world. 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). 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. -You are encouraged to customize this local content hotspot or server with the best of the world’s Free Knowledge — to suit your region, your school, your medical clinic, your library — and/or for your very own family. +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. + +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 @@ -10,7 +12,7 @@ Pre-releases of Internet-in-a-Box (IIAB) are available from http://download.iiab Please see "What are the best places for community support?" at http://FAQ.IIAB.IO which has 40+ questions and answers to help you along the way, as you put together the digital knowledge hotspot most suitable for your own community. -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 Linux distribution that has not yet been tried. +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. #### Built with Ansible @@ -24,7 +26,7 @@ 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, where mass media channels do not serve grassroots voices.* +*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 From 5ae34b8739f1d5819263b78ba5902b95b2132984 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 10 Oct 2018 20:19:22 -0400 Subject: [PATCH 5/9] Update calibre-web.conf.j2 --- roles/calibre-web/templates/calibre-web.conf.j2 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/calibre-web/templates/calibre-web.conf.j2 b/roles/calibre-web/templates/calibre-web.conf.j2 index 33a95a950..49f4f0589 100644 --- a/roles/calibre-web/templates/calibre-web.conf.j2 +++ b/roles/calibre-web/templates/calibre-web.conf.j2 @@ -1,8 +1,8 @@ - - - RequestHeader set X-SCRIPT-NAME {{ calibreweb_url }} - RequestHeader set X-SCHEME http - ProxyPass http://localhost:{{ calibreweb_port }}/ - ProxyPassReverse http://localhost:{{ calibreweb_port }}/ - - +# # This line (which used to work) prevented http://box/books from working as of October 2018 (https://github.com/iiab/iiab/issues/1196) +# # This line appears unnecessary +RequestHeader set X-SCRIPT-NAME {{ calibreweb_url }} +RequestHeader set X-SCHEME http +ProxyPass http://localhost:{{ calibreweb_port }}/ +ProxyPassReverse http://localhost:{{ calibreweb_port }}/ +# +# From 211ededa1c56ec21ab73899a1b0a687d52cca615 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 10 Oct 2018 20:32:53 -0400 Subject: [PATCH 6/9] Update calibre-web.conf.j2 --- roles/calibre-web/templates/calibre-web.conf.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/calibre-web/templates/calibre-web.conf.j2 b/roles/calibre-web/templates/calibre-web.conf.j2 index 49f4f0589..f15f0692d 100644 --- a/roles/calibre-web/templates/calibre-web.conf.j2 +++ b/roles/calibre-web/templates/calibre-web.conf.j2 @@ -1,8 +1,8 @@ # # This line (which used to work) prevented http://box/books from working as of October 2018 (https://github.com/iiab/iiab/issues/1196) -# # This line appears unnecessary +# # Line unnec when "/proxy" added to Proxy* directives below RequestHeader set X-SCRIPT-NAME {{ calibreweb_url }} -RequestHeader set X-SCHEME http -ProxyPass http://localhost:{{ calibreweb_port }}/ -ProxyPassReverse http://localhost:{{ calibreweb_port }}/ +RequestHeader set X-SCHEME http # Line unnec? +ProxyPass /books http://localhost:{{ calibreweb_port }}/ +ProxyPassReverse /books http://localhost:{{ calibreweb_port }}/ # Line unnec? # # From 2be51541cbb94a5b1a6d35996057db49326142a0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 10 Oct 2018 20:44:08 -0400 Subject: [PATCH 7/9] Update calibre-web.conf.j2 --- .../calibre-web/templates/calibre-web.conf.j2 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/roles/calibre-web/templates/calibre-web.conf.j2 b/roles/calibre-web/templates/calibre-web.conf.j2 index f15f0692d..a5efcabe9 100644 --- a/roles/calibre-web/templates/calibre-web.conf.j2 +++ b/roles/calibre-web/templates/calibre-web.conf.j2 @@ -1,8 +1,19 @@ -# # This line (which used to work) prevented http://box/books from working as of October 2018 (https://github.com/iiab/iiab/issues/1196) -# # Line unnec when "/proxy" added to Proxy* directives below +# Used to work (in August 2018) but prevented http://box/books from working (in October 2018, https://github.com/iiab/iiab/issues/1196) +# + +# Unnec when "/proxy" is added to Proxy* directives further below +# + RequestHeader set X-SCRIPT-NAME {{ calibreweb_url }} -RequestHeader set X-SCHEME http # Line unnec? + +# Appears unnec: +RequestHeader set X-SCHEME http + ProxyPass /books http://localhost:{{ calibreweb_port }}/ -ProxyPassReverse /books http://localhost:{{ calibreweb_port }}/ # Line unnec? + +# Appears unnec: +ProxyPassReverse /books http://localhost:{{ calibreweb_port }}/ + # + # From bdced5c7b6b6d70c4169907727cbf9dcf0e88894 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 10 Oct 2018 21:02:41 -0400 Subject: [PATCH 8/9] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 688edf5e9..6c7832332 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ 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. -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 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. -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 with schools, clinics and libraries around the world. Thank you for being a part of our grassroots technology movement! ## Installation From ee399dea745a5f145d2a5b5df0b46c17a2bbe612 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 10 Oct 2018 21:12:29 -0400 Subject: [PATCH 9/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c7832332..6e75e8ffe 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ The [Installation](https://github.com/iiab/iiab/wiki/IIAB-Installation) wiki pag #### Built with Ansible -FYI we use [Ansible](https://www.ansible.com) as the underlying technology to install, deploy, configure and manage the various software components. +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. ## Contributing