Merge pull request #290 from iiab/master

sync from iiab/iiab

roles/gitea/defaults/main.yml

@@ -8,7 +8,7 @@
 # https://git.coolaj86.com/coolaj86/gitea-installer.sh
 
 # Information needed to install Gitea
-gitea_version: 1.9.2
+gitea_version: 1.9.3
 iset_suffixes:
   i386: 386
   x86_64: amd64

roles/kiwix/defaults/main.yml

@@ -10,9 +10,9 @@
 # Which kiwix-tools to download from http://download.iiab.io/packages/
 # As obtained from http://download.kiwix.org/release/kiwix-tools/ or http://download.kiwix.org/nightly/
 
-kiwix_version_armhf: "kiwix-tools_linux-armhf-3.0.1-2"
+kiwix_version_armhf: "kiwix-tools_linux-armhf-3.0.1-4"
-kiwix_version_linux64: "kiwix-tools_linux-x86_64-3.0.1-2"
+kiwix_version_linux64: "kiwix-tools_linux-x86_64-3.0.1-4"
-kiwix_version_i686: "kiwix-tools_linux-i586-3.0.1-2"
+kiwix_version_i686: "kiwix-tools_linux-i586-3.0.1-4"
 # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2"
 # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content")
 # v0.10 for i686 published Oct 2016 ("experimental") REPLACED IN EARLY 2018, thx to Matthieu Gautier:

roles/nextcloud/README.md

@@ -4,7 +4,15 @@ Students and teachers can store their documents, calendars, contacts and photos
 
 This Ansible playbook was derived from an earlier ownCloud playbook thanks to [Josh Dennis](https://github.com/floydianslips) in 2016/2017.
 
-### Install It
+## What's Included
+
+The Nextcloud suite is divided into three main categories:
+
+- [Nextcloud Files](https://nextcloud.com/files/) – Enterprise File Sync and Share
+- [Nextcloud Talk](https://nextcloud.com/talk/) – Calls, chat and web meetings
+- [Nextcloud Groupware](https://nextcloud.com/groupware/) – Calendar, Contacts & Mail
+
+## Install It
 
 (1) Set these 2 variable in [/etc/iiab/local_vars.yml](http://FAQ.IIAB.IO#What_is_local_vars.yml_and_how_do_I_customize_it.3F) prior to installing Internet-in-a-Box:
 
@@ -27,14 +35,14 @@ To further refine Nextcloud access controls based on IPv4 addresses, you can edi
 
 Useful PHP recommendations for these settings (while largely tailored to WordPress, and aimed at very low-end hardware) can be found here: [/opt/iiab/iiab/roles/httpd/tasks/main.yml](https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/main.yml#L80-L84)
 
-### Using It
+## Using It
 
 Log in to Nextcloud at http://box/nextcloud, http://box.lan/nextcloud, http://172.18.96.1/nextcloud (or similar) using:
 
     Username: Admin
     Password: changeme
 
-### Future Directions
+## Future Directions
 
 Going forward, should Internet-in-a-Box consider integrating optimizations (or more!) from these below?
 

roles/openvpn/templates/iiab-support

@@ -2,7 +2,7 @@
 
 # openvpn_handle is stored in 2 files on disk, one slightly stripped down (from
 # the other) due to Ansible.  So we emulate Ansible's behavior, when reading from
-# (and later writing to) disk, removing outer cruft as explained on Lines 27-29:
+# (and later writing to) disk, removing outer cruft as explained on Lines 31-33:
 handle1=$(grep "^openvpn_handle:" /etc/iiab/local_vars.yml | sed -e "s/^openvpn_handle://; s/^\s*//; s/\s*$//; s/^\(['\"]\)\(.*\)\1$/\2/")
 echo -e "\n/etc/iiab/local_vars.yml source/master copy: $handle1"
 if [ -f /etc/iiab/openvpn_handle ]; then

scripts/ansible

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 CURR_VER="undefined"    # Ansible version you currently have installed
-GOOD_VER="2.8.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
+GOOD_VER="2.8.5"    # 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

scripts/ansible-2.8.x

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 CURR_VER="undefined"    # Ansible version you currently have installed
-GOOD_VER="2.8.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
+GOOD_VER="2.8.5"    # 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