From 8859f06e03f25d1d285b692ada1a9c595feff107 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Oct 2017 20:56:58 -0400 Subject: [PATCH 1/7] fix kiwix_serve_enabled -> kiwix_enabled --- 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 31c1b2bfc..96f803fdd 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -276,8 +276,8 @@ rachel_doc_root: "{{ doc_root}}/modules" # Kiwix-serve kiwix_install: True +kiwix_enabled: False kiwix_port: 3000 -kiwix_serve_enabled: False iiab_zim_path: /library/zims # KA Lite From f57ac88857ed24f839eeefcea6990839ca983875 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Oct 2017 21:03:26 -0400 Subject: [PATCH 2/7] kiwix_enabled: False -> kiwix_enabled: True to abide by norms --- 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 96f803fdd..d4eaa3c06 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -276,7 +276,7 @@ rachel_doc_root: "{{ doc_root}}/modules" # Kiwix-serve kiwix_install: True -kiwix_enabled: False +kiwix_enabled: True kiwix_port: 3000 iiab_zim_path: /library/zims From 7e3b33c35ac2de8aca85da18e0db959f4396e365 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Oct 2017 21:15:03 -0400 Subject: [PATCH 3/7] kiwix_serve_enabled: False -> kiwix_enabled: True --- roles/kiwix/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index b6bac169f..aca4baf68 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -5,6 +5,6 @@ iiab_zim_path: /library/zims kiwix_library_xml: "{{ iiab_zim_path }}/library.xml" kiwix_content_path: "{{ iiab_zim_path }}/content" kiwix_install: True -kiwix_serve_enabled: False +kiwix_enabled: True kiwix_content_found: False kiwix_first_pass: False From 1af455656728e8a6ca7d756016077b82932bb3f5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Oct 2017 21:16:24 -0400 Subject: [PATCH 4/7] spacing cleanup --- roles/kiwix/tasks/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/kiwix/tasks/main.yml b/roles/kiwix/tasks/main.yml index 01d70b5c3..92ea14d6d 100644 --- a/roles/kiwix/tasks/main.yml +++ b/roles/kiwix/tasks/main.yml @@ -1,4 +1,3 @@ - #- name: Set kiwix source file name i686 # set_fact: # kiwix_src_file: "kiwix-linux-i686.tar.bz2" @@ -28,4 +27,3 @@ - debug: msg="WARNING kiwix source is not defined for your platform" when: not kiwix_src_file - From da82fa06590d1644bbc66db36dddf2e1bf5f6083 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Oct 2017 21:17:45 -0400 Subject: [PATCH 5/7] kiwix_serve_enabled -> kiwix_enabled --- roles/kiwix/tasks/kiwix_install.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml index b0d5ec5dc..4b6d03cf1 100644 --- a/roles/kiwix/tasks/kiwix_install.yml +++ b/roles/kiwix/tasks/kiwix_install.yml @@ -128,16 +128,16 @@ - option: kiwix_content_path value: "{{ kiwix_content_path }}" - option: enabled - value: "{{ kiwix_serve_enabled }}" + value: "{{ kiwix_enabled }}" - name: Enable kiwix-serve service service: name=kiwix-serve enabled=yes state=restarted - when: kiwix_serve_enabled + when: kiwix_enabled - name: Disable kiwix-serve service service: name=kiwix-serve enabled=no state=stopped - when: not kiwix_serve_enabled + when: not kiwix_enabled From 7855aafee928a75520df38623ace1343d49d561f Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Oct 2017 21:24:59 -0400 Subject: [PATCH 6/7] sync from latest community norms @ http://wiki.laptop.org/go/IIAB/local_vars.yml --- vars/medium.localvars | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/vars/medium.localvars b/vars/medium.localvars index 79f232c74..6982f9484 100644 --- a/vars/medium.localvars +++ b/vars/medium.localvars @@ -1,8 +1,8 @@ # Put variables here to override /opt/iiab/iiab/vars/default_vars.yml # PLEASE READ http://wiki.laptop.org/go/IIAB/local_vars.yml -# SEE EXAMPLE http://download.iiab.io/6.4/rpi/local_vars_big.yml -# SEE EXAMPLE http://download.iiab.io/6.4/rpi/local_vars_min.yml +# SEE EXAMPLE http://download.iiab.io/6.5/rpi/local_vars_big.yml +# SEE EXAMPLE http://download.iiab.io/6.5/rpi/local_vars_min.yml # Original Idea: branch github.com/xsce/xsce-local for your deployment @@ -42,8 +42,9 @@ squid_enabled: False dansguardian_install: False dansguardian_enabled: False -wondershaper_install: False -wondershaper_enabled: False +# Unmaintained +# wondershaper_install: False +# wondershaper_enabled: False # 4-SERVER-OPTIONS @@ -54,7 +55,7 @@ openvpn_enabled: False # openvpn_cron_enabled: True # If changing the above, remember to run "cd /opt/iiab/iiab; ./runtags openvpn" -# WARNING: Josh Dennis [April 2017] warned that CUPS printing can block Ansible +# Common UNIX Printing System cups_install: True cups_enabled: False @@ -68,7 +69,8 @@ phpmyadmin_enabled: False # 5-XO-SERVICES -# Lesser-supported XO services need additional testing. Please contact +# Lesser-supported XO services need additional testing. Please uncomment +# the line containing 5-xo-services within /opt/iiab/iiab/iiab.yml and contact # http://lists.laptop.org/pipermail/server-devel/ if you're able to help test. # authserver_install: False @@ -113,8 +115,8 @@ dokuwiki_enabled: False osm_install: True osm_enabled: True -kiwix_serve_install: True -kiwix_serve_enabled: True +kiwix_install: True +kiwix_enabled: True kalite_install: True kalite_enabled: True From f9eef63af52a008d442e4b68339d878001547be2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Oct 2017 23:05:54 -0400 Subject: [PATCH 7/7] typo: XECE -> IIAB --- roles/2-common/tasks/centos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/2-common/tasks/centos.yml b/roles/2-common/tasks/centos.yml index 70b653742..31e992924 100644 --- a/roles/2-common/tasks/centos.yml +++ b/roles/2-common/tasks/centos.yml @@ -13,7 +13,7 @@ with_items: - epel-release -- name: Install XECE repo for CentOS +- name: Install IIAB repo for CentOS template: src={{ item }} dest=/etc/yum.repos.d/ owner=root group=root mode=0644 with_items: - iiab-centos.repo