diff --git a/README.md b/README.md index 3de62a82f..6e75e8ffe 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,37 @@ # 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. +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. -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. +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 -Please read the [Installation](https://github.com/iiab/iiab/wiki/IIAB-Installation) wiki page for details about installation 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. -## Built With +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. -* [Ansible](http://www.ansible.com) +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 + +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 -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 kinds! + +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 -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 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). + +Finally older versions are also available, from [github.com/xsce](http://github.com/xsce) and [schoolserver.org](http://schoolserver.org). diff --git a/roles/calibre-web/templates/calibre-web.conf.j2 b/roles/calibre-web/templates/calibre-web.conf.j2 index 33a95a950..a5efcabe9 100644 --- a/roles/calibre-web/templates/calibre-web.conf.j2 +++ b/roles/calibre-web/templates/calibre-web.conf.j2 @@ -1,8 +1,19 @@ - - - RequestHeader set X-SCRIPT-NAME {{ calibreweb_url }} - RequestHeader set X-SCHEME http - ProxyPass http://localhost:{{ calibreweb_port }}/ - ProxyPassReverse http://localhost:{{ calibreweb_port }}/ - - +# 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 }} + +# Appears unnec: +RequestHeader set X-SCHEME http + +ProxyPass /books http://localhost:{{ calibreweb_port }}/ + +# Appears unnec: +ProxyPassReverse /books http://localhost:{{ calibreweb_port }}/ + +# + +#