From 0c18bf28c6eee88e31798d589ac45eed138c5648 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 29 May 2020 05:25:11 -0400 Subject: [PATCH 1/7] Update local_vars_min.yml --- vars/local_vars_min.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index dd3e57de1..f32591746 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -128,8 +128,6 @@ openvpn_install: True openvpn_enabled: False # Set /etc/iiab/openvpn_handle in advance here: openvpn_handle: -# The following seems necessary on CentOS: -# openvpn_cron_enabled: True # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. # Please see recommendations at: https://itsfoss.com/swap-size/ @@ -150,7 +148,7 @@ pi_swap_file_size: 1024 nginx_high_php_limits: False # WARNING: Enabling this might cause excess use of RAM/disk or other resources! # SO AFTER INSTALLING IIAB, VERIFY THAT THESE 5 SETTINGS... -# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L53-L67 +# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L52-L66 # ...ARE SUITABLE FOR YOUR HARDWARE, for: /etc/php//fpm/php.ini # See also Apache vars {default_language, language_priority} @ top of this file From 0787c01539389e65c806fb7725c694186c459244 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 29 May 2020 05:25:57 -0400 Subject: [PATCH 2/7] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 69202f6b1..f4f5f7464 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -128,8 +128,6 @@ openvpn_install: True openvpn_enabled: False # Set /etc/iiab/openvpn_handle in advance here: openvpn_handle: -# The following seems necessary on CentOS: -# openvpn_cron_enabled: True # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. # Please see recommendations at: https://itsfoss.com/swap-size/ @@ -150,7 +148,7 @@ pi_swap_file_size: 1024 nginx_high_php_limits: False # WARNING: Enabling this might cause excess use of RAM/disk or other resources! # SO AFTER INSTALLING IIAB, VERIFY THAT THESE 5 SETTINGS... -# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L53-L67 +# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L52-L66 # ...ARE SUITABLE FOR YOUR HARDWARE, for: /etc/php//fpm/php.ini # See also Apache vars {default_language, language_priority} @ top of this file From 58fd9153343d02a565049e158028051105b1a47a Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 29 May 2020 05:28:08 -0400 Subject: [PATCH 3/7] Update local_vars_big.yml --- vars/local_vars_big.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index e39639121..2b859b4bd 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -128,8 +128,6 @@ openvpn_install: True openvpn_enabled: False # Set /etc/iiab/openvpn_handle in advance here: openvpn_handle: -# The following seems necessary on CentOS: -# openvpn_cron_enabled: True # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4. # Please see recommendations at: https://itsfoss.com/swap-size/ @@ -150,7 +148,7 @@ pi_swap_file_size: 1024 nginx_high_php_limits: False # WARNING: Enabling this might cause excess use of RAM/disk or other resources! # SO AFTER INSTALLING IIAB, VERIFY THAT THESE 5 SETTINGS... -# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L53-L67 +# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L52-L66 # ...ARE SUITABLE FOR YOUR HARDWARE, for: /etc/php//fpm/php.ini # See also Apache vars {default_language, language_priority} @ top of this file From b9fcf7f188228b7484715616bb7a08cd6a5b587b Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 29 May 2020 05:31:24 -0400 Subject: [PATCH 4/7] 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 955e128c0..1076649af 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -252,7 +252,7 @@ nginx_log_dir: /var/log/nginx nginx_high_php_limits: False # WARNING: Enabling this might cause excess use of RAM/disk or other resources! # SO AFTER INSTALLING IIAB, VERIFY THAT THESE 5 SETTINGS... -# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L53-L67 +# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L52-L66 # ...ARE SUITABLE FOR YOUR HARDWARE, for: /etc/php//fpm/php.ini # Make this False to disable http://box/common/services/power_off.php button: From 22979c14c401765ca3e794bf383729fc2a4d4e86 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 29 May 2020 11:59:28 -0500 Subject: [PATCH 5/7] use /etc/rpi-issue for raspbian test --- scripts/local_facts.fact | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact index 5b60bbe08..9f4143ce9 100755 --- a/scripts/local_facts.fact +++ b/scripts/local_facts.fact @@ -11,6 +11,9 @@ fi OS=`grep ^ID= /etc/*elease|cut -d= -f2` OS=${OS//\"/} +if [ -f /etc/rpi-issue ]; then + OS="raspbian" +fi VERSION_ID=`grep VERSION_ID /etc/*elease | cut -d= -f2` VERSION_ID=${VERSION_ID//\"/} VERSION_ID=${VERSION_ID%%.*} From 67a12c2b771467d9ca794b7a7f27c84bd5c953c4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 3 Jun 2020 11:57:14 -0400 Subject: [PATCH 6/7] Calibre-Web 0.6.7 -> 0.6.8 --- roles/calibre-web/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre-web/defaults/main.yml b/roles/calibre-web/defaults/main.yml index 70a67d517..57b109bc1 100644 --- a/roles/calibre-web/defaults/main.yml +++ b/roles/calibre-web/defaults/main.yml @@ -14,7 +14,7 @@ # 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! -calibreweb_version: 0.6.7 # WAS: master, 0.6.4, 0.6.5, 0.6.7 +calibreweb_version: 0.6.8 # WAS: master, 0.6.4, 0.6.5, 0.6.6, 0.6.7 calibreweb_venv_path: /usr/local/calibre-web-py3 calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py" From d25950e8b1fd5f8e434979c2c6e4bb60088fa85b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 4 Jun 2020 12:32:03 -0400 Subject: [PATCH 7/7] kiwix-tools 3.1.1-0 -> 3.1.1-4 --- roles/kiwix/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index 12d780f7d..d41bc10de 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -26,9 +26,9 @@ kiwix_library_xml: "{{ iiab_zim_path }}/library.xml" # http://download.kiwix.org/release/kiwix-tools/ ...or sometimes... # http://download.kiwix.org/nightly/ -kiwix_version_armhf: kiwix-tools_linux-armhf-3.1.1-0 -kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.1-0 -kiwix_version_i686: kiwix-tools_linux-i586-3.1.1-0 +kiwix_version_armhf: kiwix-tools_linux-armhf-3.1.1-4 +kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.1-4 +kiwix_version_i686: kiwix-tools_linux-i586-3.1.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")