Merge pull request #422 from holta/master

fix kiwix_serve_enabled -> kiwix_enabled in vars/default_vars.yml + other files

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

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

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

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
-

vars/default_vars.yml

@@ -276,8 +276,8 @@ rachel_doc_root: "{{ doc_root}}/modules"
 
 # Kiwix-serve
 kiwix_install: True
+kiwix_enabled: True
 kiwix_port: 3000
-kiwix_serve_enabled: False
 iiab_zim_path: /library/zims
 
 # KA Lite

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