From 083c8abf6fe262b81e87622c499e2cea2358395e Mon Sep 17 00:00:00 2001 From: root Date: Thu, 26 Mar 2020 12:44:17 -0400 Subject: [PATCH 1/8] Move 'rtc_id: ds3231' from vars/*.yml to vars/local_vars_*.yml --- vars/local_vars_big.yml | 3 +++ vars/local_vars_medium.yml | 3 +++ vars/local_vars_min.yml | 3 +++ vars/raspbian-10.yml | 1 - vars/raspbian-8.yml | 1 - vars/raspbian-9.yml | 1 - 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 116c65daf..24ef93c34 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -15,6 +15,9 @@ download_timeout: 200 default_language: en language_priority: en es fr +# Real-time clock: set RTC chip family here. Future auto-detection plausible? +# rtc_id: ds3231 + # Set iiab_admin_user_install: False if you don't want iiab_admin_user & wheel # group auto-created in roles/iiab-admin/tasks/main.yml (hence disabling sudo- # checks/warnings of published passwds like pi/raspberry & iiab-admin/g0adm1n). diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index a3d36f19f..b8f66307b 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -15,6 +15,9 @@ download_timeout: 200 default_language: en language_priority: en es fr +# Real-time clock: set RTC chip family here. Future auto-detection plausible? +# rtc_id: ds3231 + # Set iiab_admin_user_install: False if you don't want iiab_admin_user & wheel # group auto-created in roles/iiab-admin/tasks/main.yml (hence disabling sudo- # checks/warnings of published passwds like pi/raspberry & iiab-admin/g0adm1n). diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 038c496f1..8918cd634 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -15,6 +15,9 @@ download_timeout: 200 default_language: en language_priority: en es fr +# Real-time clock: set RTC chip family here. Future auto-detection plausible? +# rtc_id: ds3231 + # Set iiab_admin_user_install: False if you don't want iiab_admin_user & wheel # group auto-created in roles/iiab-admin/tasks/main.yml (hence disabling sudo- # checks/warnings of published passwds like pi/raspberry & iiab-admin/g0adm1n). diff --git a/vars/raspbian-10.yml b/vars/raspbian-10.yml index 999ed0dac..1f156a007 100644 --- a/vars/raspbian-10.yml +++ b/vars/raspbian-10.yml @@ -3,7 +3,6 @@ is_debian: True is_debian_10: True is_raspbian: True is_raspbian_10: True -rtc_id: ds3231 # 2019-03-23: These apply if-only-if named_install and/or dhcpd_install are True # (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True) diff --git a/vars/raspbian-8.yml b/vars/raspbian-8.yml index c27a6111c..1d5e190e3 100644 --- a/vars/raspbian-8.yml +++ b/vars/raspbian-8.yml @@ -3,7 +3,6 @@ is_debian: True is_debian_8: True is_raspbian: True is_raspbian_8: True -rtc_id: ds3231 # 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True # (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True) diff --git a/vars/raspbian-9.yml b/vars/raspbian-9.yml index f64d9d93b..069afaac9 100644 --- a/vars/raspbian-9.yml +++ b/vars/raspbian-9.yml @@ -3,7 +3,6 @@ is_debian: True is_debian_9: True is_raspbian: True is_raspbian_9: True -rtc_id: ds3231 # 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True # (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True) From 7e18f8b345f22853340dfabd5bed55cb16820918 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 26 Mar 2020 12:55:19 -0400 Subject: [PATCH 2/8] Move 'Keep local_vars_min.yml in sync w/ default_vars.yml --- vars/default_vars.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 068a9df66..90fbf7ca8 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -43,6 +43,9 @@ download_timeout: 200 default_language: en language_priority: en es fr +# Real-time clock: set RTC chip family here. Future auto-detection plausible? +# rtc_id: ds3231 + # Set iiab_admin_user_install: False if you don't want iiab_admin_user & wheel # group auto-created in roles/iiab-admin/tasks/main.yml (hence disabling sudo- # checks/warnings of published passwds like pi/raspberry & iiab-admin/g0adm1n). From 7e931c5e219c7eab93fe3e59ea4ea9f83e8271b8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 26 Mar 2020 13:54:00 -0400 Subject: [PATCH 3/8] MediaWiki 1.34.0 -> 1.34.1 --- roles/mediawiki/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mediawiki/defaults/main.yml b/roles/mediawiki/defaults/main.yml index 2f49d7548..9bb11c388 100644 --- a/roles/mediawiki/defaults/main.yml +++ b/roles/mediawiki/defaults/main.yml @@ -4,8 +4,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! -mediawiki_major_version: "1.34" -mediawiki_minor_version: "0" +mediawiki_major_version: 1.34 # "1.34" also works +mediawiki_minor_version: 1 mediawiki_version: "{{ mediawiki_major_version }}.{{ mediawiki_minor_version }}" mediawiki_download_base_url: "https://releases.wikimedia.org/mediawiki/{{ mediawiki_major_version }}" From 9f3b91e4902336ab272cb44a463aeb947cc5e3e5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 26 Mar 2020 15:00:16 -0400 Subject: [PATCH 4/8] Change usb_lib (typo, old) to usb_lib (new) in NGINX doc --- roles/nginx/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/nginx/README.md b/roles/nginx/README.md index fb28ac4cb..0293ba547 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -10,7 +10,7 @@ 2. Without PHP available via FastCGI, any function at all for PHP-based applications validates NGINX. -3. Current state of IIAB App/Service migrations as of 2020-02-18: +3. Current state of IIAB App/Service migrations as of 2020-03-26: 1. These support "Native" NGINX but ***NOT*** Apache * Admin Console @@ -18,7 +18,7 @@ * IIAB documentation (http://box/info) * osm-vector-maps * OER2Go/RACHEL modules - * usb-lib + * usb_lib 2. These support "Native" NGINX ***AND*** Apache, a.k.a. "dual support" for legacy testing (if suitable "Shims" from *Section iii.* below are preserved!) Both "Native" NGINX and "Shim" proxying from NGINX to Apache port 8090 *cannot be enabled simultaneously* for these IIAB Apps/Service. But if you want to attempt their "Shim" proxying legacy testing mode, change your *primary web server* over to Apache by setting `nginx_enabled: False` in [/etc/iiab/local_vars.yml](http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F) (which will [auto-enable Apache](../0-init/tasks/main.yml#L40-L44) for your testing). * awstats @@ -47,4 +47,4 @@ * pbx [*] * transmission [*] -[*] The 5 above starred roles could use improvement, as of 2020-02-18. +[*] The 5 above starred roles could use improvement, as of 2020-03-26. From 3f49ea412d0f80ecab8bed4868bbf6dc1d423e44 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 26 Mar 2020 15:03:11 -0400 Subject: [PATCH 5/8] Update broken links in roles/nginx/README.md --- roles/nginx/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nginx/README.md b/roles/nginx/README.md index 0293ba547..82e729a30 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -20,7 +20,7 @@ * OER2Go/RACHEL modules * usb_lib - 2. These support "Native" NGINX ***AND*** Apache, a.k.a. "dual support" for legacy testing (if suitable "Shims" from *Section iii.* below are preserved!) Both "Native" NGINX and "Shim" proxying from NGINX to Apache port 8090 *cannot be enabled simultaneously* for these IIAB Apps/Service. But if you want to attempt their "Shim" proxying legacy testing mode, change your *primary web server* over to Apache by setting `nginx_enabled: False` in [/etc/iiab/local_vars.yml](http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F) (which will [auto-enable Apache](../0-init/tasks/main.yml#L40-L44) for your testing). + 2. These support "Native" NGINX ***AND*** Apache, a.k.a. "dual support" for legacy testing (if suitable "Shims" from *Section iii.* below are preserved!) Both "Native" NGINX and "Shim" proxying from NGINX to Apache port 8090 *cannot be enabled simultaneously* for these IIAB Apps/Service. But if you want to attempt their "Shim" proxying legacy testing mode, change your *primary web server* over to Apache by setting `nginx_enabled: False` in [/etc/iiab/local_vars.yml](http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F) (which will [auto-enable Apache](../0-init/tasks/main.yml#L47-L51) for your testing). * awstats * calibre-web * gitea @@ -32,7 +32,7 @@ * sugarizer * wordpress - 3. These support Apache but ***NOT*** "Native" NGINX. They use a "Shim" to [proxy_pass](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) from NGINX to Apache on port 8090. See [roles/0-init/tasks/main.yml#L40-L44](../0-init/tasks/main.yml#L40-L44) for a list of these IIAB Apps/Services, that auto-enable Apache. + 3. These support Apache but ***NOT*** "Native" NGINX. They use a "Shim" to [proxy_pass](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) from NGINX to Apache on port 8090. See [roles/0-init/tasks/main.yml#L47-L51](../0-init/tasks/main.yml#L47-L51) for a list of these IIAB Apps/Services, that auto-enable Apache. * elgg * lokole * moodle From 48c114a5495df587d03be0ccf5fe01a930884d03 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 27 Mar 2020 02:23:30 -0400 Subject: [PATCH 6/8] Install python2, if Raspbian/Debian > 10 or Ubuntu > 19 --- roles/kalite/tasks/install.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index e77432620..53bfc1d8a 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -11,10 +11,11 @@ # ignore_errors: yes # when: is_raspbian | bool -- name: Install python2 - package: +- name: Install python2, if Raspbian/Debian > 10 or Ubuntu > 19 + package: name: python2 state: present + when: not (is_debian_9 or is_debian_10 or is_ubuntu_16 or is_ubuntu_17 or is_ubuntu_18 or is_ubuntu_19) # 2020-03-26: Testing for {is_raspbian_9, is_raspbian_10} is not currently nec, as testing for {is_debian_9, is_debian_10} covers that already. - name: Use pip to install KA Lite static to {{ kalite_venv }} pip: From 34672c05ed1cf28ead27bee08b76e20d8a60cbbf Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 27 Mar 2020 02:38:47 -0400 Subject: [PATCH 7/8] Tiny typo in comment (date) --- roles/kalite/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index 53bfc1d8a..6a17553d7 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -15,7 +15,7 @@ package: name: python2 state: present - when: not (is_debian_9 or is_debian_10 or is_ubuntu_16 or is_ubuntu_17 or is_ubuntu_18 or is_ubuntu_19) # 2020-03-26: Testing for {is_raspbian_9, is_raspbian_10} is not currently nec, as testing for {is_debian_9, is_debian_10} covers that already. + when: not (is_debian_9 or is_debian_10 or is_ubuntu_16 or is_ubuntu_17 or is_ubuntu_18 or is_ubuntu_19) # 2020-03-27: Testing for {is_raspbian_9, is_raspbian_10} is not currently nec, as testing for {is_debian_9, is_debian_10} covers that already. - name: Use pip to install KA Lite static to {{ kalite_venv }} pip: From 009d396db8f6352450161188bf8a567a00e26c40 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Mar 2020 11:37:20 -0400 Subject: [PATCH 8/8] NGINX: fancyindex instead of autoindex, for http://box/usb --- roles/nginx/templates/iiab.conf.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nginx/templates/iiab.conf.j2 b/roles/nginx/templates/iiab.conf.j2 index 187e30e36..d1c01c122 100644 --- a/roles/nginx/templates/iiab.conf.j2 +++ b/roles/nginx/templates/iiab.conf.j2 @@ -4,11 +4,11 @@ location / { location /usb { alias /library/www/html/local_content/; - autoindex on; + fancyindex on; # autoindex on; } location /local_content/ { - autoindex on; + fancyindex on; # autoindex on; } location /modules/ {