From 06102d74313cff51d67128c3cbcf0d74f5bafdd1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 22 May 2020 10:39:21 -0400 Subject: [PATCH 1/5] Nix apache2 install from 9-local-addons/tasks/main.yml --- roles/9-local-addons/tasks/main.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index eccf86b7c..a3d75b443 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/roles/9-local-addons/tasks/main.yml @@ -30,11 +30,6 @@ name: calibre-web when: calibreweb_install | bool -- name: '2020-05-21: TEMPORARILY INSTALL APACHE UNTIL ADMIN CONSOLE DECLARES (OR REMOVES?) ITS DEPENDENCY within [console : Enable ssl] to avoid error "Neither of apache2ctl nor apachctl found. At least one apache control binary is necessary." -- possibly var adm_cons_force_ssl is still useful here?' - package: - name: apache2 - when: admin_console_install | bool - - name: Recording STAGE 9 HAS COMPLETED ==================== lineinfile: path: "{{ iiab_env_file }}" From a78a4eea29bce46c51d7fd4698472c3242c7cddb Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 22 May 2020 10:43:43 -0400 Subject: [PATCH 2/5] Update vars/default_vars.yml --- vars/default_vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 990be83af..955e128c0 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -229,9 +229,9 @@ pi_swap_file_size: 1024 # 3-BASE-SERVER -# 2020-01-22: See also js_menu_install (above). -admin_console_install: True # For now in roles/9-local-addons/tasks/main.yml -admin_console_enabled: True # Not in active use as of 2020-05-21 +# 2020-05-22: Neither in use at the moment. See also js_menu_install (above). +admin_console_install: True +admin_console_enabled: True # MySQL MANDATORY - THESE 2 VARS HAVE NO EFFECT - SEE roles/0-init/tasks/main.yml & roles/mysql/tasks/main.yml mysql_install: True From 3d41b449d417e6e7af2ae8984294b93d859e5915 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 22 May 2020 11:12:03 -0400 Subject: [PATCH 3/5] kiwix-tools 3.1.1 -> 3.1.1-0 --- 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 bc92d928e..12d780f7d 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 -kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.1 -kiwix_version_i686: kiwix-tools_linux-i586-3.1.1 +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_src_file_i686: "kiwix-linux-i686.tar.bz2" # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content") From 29507f1c9ef2b3b25104edcc95bc28c6f0a631f0 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Fri, 22 May 2020 13:54:36 -0400 Subject: [PATCH 4/5] move the couch --- vars/local_vars_medical.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/local_vars_medical.yml b/vars/local_vars_medical.yml index 37ef36418..910ddb04b 100644 --- a/vars/local_vars_medical.yml +++ b/vars/local_vars_medical.yml @@ -1,8 +1,8 @@ # Default overrides kalite_install: False kalite_enabled: False -captive_portal_install: True -captive_portal_enabled: True +captiveportal_install: True +captiveportal_enabled: True mediawiki_install: True mediawiki_enabled: True osm_vector_maps_install: False From 356d969e66d68320015612f945d6b4c6cd034402 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sun, 24 May 2020 14:42:21 -0400 Subject: [PATCH 5/5] add default vpn handle for medical local vars --- vars/local_vars_medical.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/local_vars_medical.yml b/vars/local_vars_medical.yml index 910ddb04b..f8a48535f 100644 --- a/vars/local_vars_medical.yml +++ b/vars/local_vars_medical.yml @@ -11,6 +11,7 @@ munin_install: True munin_enabled: True vnstat_install: True vnstat_enabled: True +openvpn_handle: "Medical IIAB - Put Your Name Here" # By default # kiwix # awstats