From 01197db87c1e5c94498e236e3482685269fb5328 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 12 Jul 2018 13:36:09 -0400 Subject: [PATCH 01/13] Understandability/Context for outsiders --- roles/network/defaults/main.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml index 55c2ffff1..a6a7cc8b4 100644 --- a/roles/network/defaults/main.yml +++ b/roles/network/defaults/main.yml @@ -1,4 +1,3 @@ ---- # Defaults for network detection wireless_lan_present: False strict_networking: False @@ -19,14 +18,14 @@ discovered_lan_iface: "none" discovered_wired_iface: "none" discovered_wireless_iface: "none" -#Redhat +# Red Hat #iiab_wired_lan_iface: "none" #iiab_wireless_lan_iface: "none" has_WAN: False has_ifcfg_gw: "none" has_wifi_gw: "none" -#Debian +# Debian dhcpcd_result: "" wan_in_interfaces: False network_manager_active: False @@ -39,7 +38,7 @@ gui_desired_network_role: Gateway wondershaper_dspeed: "4096" wondershaper_upspeed: "1024" -# WiFi +# Wi-Fi host_ssid: IIAB hostapd_wait: 1 host_wifi_mode: g @@ -63,16 +62,18 @@ network_config_dir: /etc/network/interfaces.d dns_jail_enabled: False services_externally_visible: False -# following variables set for old apache,dhcpd,named usage +# Following variables set for old apache, dhcpd, named usage dhcpd_install: True dhcpd_enabled: True named_install: True named_enabled: True dnsmasq_enabled: False dnsmasq_install: False + +# Possibly useful Tim's earlier Nodogsplash (github.com/iiab/iiab/issues/826) captive_portal_enabled: False -# for simple python captive portal +# For simple python Captive Portal (for Anish & Jerry's github.com/iiab/iiab/pull/870) py_captive_portal_install: True py_captive_portal_enabled: True py_captive_portal_port: "9090" From d9398e39a7b9cd7d710ed4ed2b5192bd425aef75 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 12 Jul 2018 13:36:44 -0400 Subject: [PATCH 02/13] modern Ansible syntax/style for readability --- roles/network/tasks/captive_portal.yml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/roles/network/tasks/captive_portal.yml b/roles/network/tasks/captive_portal.yml index 8dad37fa7..033314121 100644 --- a/roles/network/tasks/captive_portal.yml +++ b/roles/network/tasks/captive_portal.yml @@ -1,8 +1,10 @@ -- name: Create directory for captive portal script - file: path=/opt/iiab/captive-portal state=directory +- name: Create directory for Captive Portal script + file: + path: /opt/iiab/captive-portal + state: directory when: py_captive_portal_install -- name: Copy captive portal script +- name: Copy Captive Portal script template: src: roles/network/templates/captive_portal/captive_portal.py.j2 dest: /opt/iiab/captive-portal/captive_portal.py @@ -11,7 +13,7 @@ mode: 0740 when: py_captive_portal_install -- name: Copy captive portal service file +- name: Copy Captive Portal service file template: src: roles/network/templates/captive_portal/captive_portal.service.j2 dest: /etc/systemd/system/captive_portal.service @@ -21,17 +23,25 @@ when: py_captive_portal_install - name: Enable captive_portal after copying files - service: name=captive_portal.service enabled=yes + service: + name: captive_portal.service + enabled: yes when: py_captive_portal_install and py_captive_portal_enabled - name: Start captive_portal after copying files - service: name=captive_portal.service state=started + service: + name: captive_portal.service + state: started when: py_captive_portal_install and py_captive_portal_enabled - name: Disable captive_portal after copying files - service: name=captive_portal.service enabled=no + service: + name: captive_portal.service + enabled: no when: py_captive_portal_install and py_captive_portal_enabled - name: Stop captive_portal after copying files - service: name=captive_portal.service state=started + service: + name: captive_portal.service + state: started when: py_captive_portal_install and py_captive_portal_enabled From 1337b651acdab67458ca0045dbf97db8589a6469 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 12 Jul 2018 13:50:32 -0400 Subject: [PATCH 03/13] modern Ansible syntax/style for readability --- roles/network/tasks/enable_services.yml | 174 ++++++++++++++---------- 1 file changed, 99 insertions(+), 75 deletions(-) diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index 5660691c7..e7d0e403b 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -1,157 +1,181 @@ - name: Disable dhcpd service - service: name=dhcpd - enabled=no + service: + name: dhcpd + enabled: no when: not dhcpd_enabled and dhcpd_install # service is restarted with NM dispatcher.d script - name: Enable dhcpd service - service: name=dhcpd - enabled=yes + service: + name: dhcpd + enabled: yes when: dhcpd_enabled and dhcpd_install - name: Copy /etc/sysconfig/dhcpd file - template: src={{ item.src }} - dest={{ item.dest }} - owner=root - group=root - mode={{ item.mode }} + template: + src: "{{ item.src }}" + dest: "{{ item.dest }}" + owner: root + group: root + mode: "{{ item.mode }}" with_items: - - { src: 'dhcp/dhcpd-env.j2' , dest: '/etc/sysconfig/dhcpd' , mode: '0644' } + - { src: 'dhcp/dhcpd-env.j2', dest: '/etc/sysconfig/dhcpd', mode: '0644' } - { src: 'dhcp/dhcpd-iiab.conf.j2', dest: '/etc/dhcpd-iiab.conf', mode: '0644' } when: dhcpd_enabled and dhcpd_install - name: Copy named file - template: src={{ item.src }} - dest={{ item.dest }} - owner=root - group=root - mode={{ item.mode }} + template: + src: "{{ item.src }}" + dest: "{{ item.dest }}" + owner: root + group: root + mode: "{{ item.mode }}" with_items: - { src: 'named/named-iiab.conf.j2' , dest: '/etc/named-iiab.conf' , mode: '0644' } - { src: 'named/school.local.zone.db' , dest: '/var/named-iiab/' , mode: '0644' } - { src: 'named/school.internal.zone.db' , dest: '/var/named-iiab/' , mode: '0644' } - name: Enable named service - service: name={{ dns_service }} - enabled=yes + service: + name: "{{ dns_service }}" + enabled: yes when: named_enabled and named_install - name: Disable named service - service: name={{ dns_service }} - enabled=no + service: + name: "{{ dns_service }}" + enabled: no when: not named_enabled and named_install - name: Disable dnsmasq - service: name=dnsmasq - enabled=no + service: + name: dnsmasq + enabled: no when: not dnsmasq_enabled and dnsmasq_install -- name: dnsmasq copy config file to /etc - template: src=network/dnsmasq.conf.j2 dest=/etc/dnsmasq.conf +- name: Copy dnsmasq.conf to /etc + template: + src: network/dnsmasq.conf.j2 + dest: /etc/dnsmasq.conf when: dnsmasq_enabled and dnsmasq_install - name: Enable dnsmasq - service: name=dnsmasq - enabled=yes + service: + name: dnsmasq + enabled: yes when: dnsmasq_enabled and dnsmasq_install - name: Enable DansGuardian - service: name=dansguardian - enabled=yes + service: + name: dansguardian + enabled: yes when: dansguardian_enabled and dansguardian_install - name: Disable DansGuardian - service: name=dansguardian - enabled=no + service: + name: dansguardian + enabled: no when: not dansguardian_enabled and dansguardian_install - name: Create xs_httpcache flag - lineinfile: dest=/etc/iiab/iiab.env - regexp='^HTTPCACHE_ON=*' - line='HTTPCACHE_ON=True' - state=present + lineinfile: + dest: /etc/iiab/iiab.env + regexp: '^HTTPCACHE_ON=*' + line: 'HTTPCACHE_ON=True' + state: present when: squid_enabled and squid_install - name: Enable Squid service - service: name={{ proxy }} - enabled=yes + service: + name: "{{ proxy }}" + enabled: yes when: squid_enabled and squid_install - name: Copy init script and config file - template: src={{ item.src }} - dest={{ item.dest }} - owner={{ item.owner }} - group={{ item.group }} - mode={{ item.mode }} + template: + src: "{{ item.src }}" + dest: "{{ item.dest }}" + owner: "{{ item.owner }}" + group: "{{ item.group }}" + mode: "{{ item.mode }}" with_items: - - src: 'squid/squid-iiab.conf.j2' + - src: squid/squid-iiab.conf.j2 dest: '/etc/{{ proxy }}/squid-iiab.conf' owner: '{{ proxy_user }}' group: '{{ proxy_user }}' - mode: '0644' + mode: 0644 when: squid_enabled and squid_install - name: Point to Squid config file from startup file - lineinfile: regexp='^CONFIG' - line='CONFIG=/etc/{{ proxy }}/squid-iiab.conf' - dest=/etc/init.d/{{ proxy }} + lineinfile: + regexp: '^CONFIG' + line: 'CONFIG=/etc/{{ proxy }}/squid-iiab.conf' + dest: "/etc/init.d/{{ proxy }}" when: squid_enabled and squid_install and is_debuntu - name: Disable Squid service - service: name={{ proxy }} - enabled=no + service: + name: "{{ proxy }}" + enabled: no when: not squid_enabled and squid_install - name: Remove xs_httpcache flag - lineinfile: dest=/etc/iiab/iiab.env - regexp='^HTTPCACHE_ON=*' - line='HTTPCACHE_ON=False' - state=present + lineinfile: + dest: /etc/iiab/iiab.env + regexp: '^HTTPCACHE_ON=*' + line: 'HTTPCACHE_ON=False' + state: present when: not squid_enabled - name: Enable Wondershaper service - service: name=wondershaper - enabled=yes + service: + name: wondershaper + enabled: yes when: wondershaper_enabled and wondershaper_install - name: Disable Wondershaper service - service: name=wondershaper - enabled=no + service: + name: wondershaper + enabled: no when: not wondershaper_enabled and wondershaper_install # check-LAN should be iptables.yml remove later - name: Grab clean copy of iiab-gen-iptables - template: src={{ item.0 }} - dest={{ item.1 }} - owner='root' - group='root' - mode='0755' + template: + src: "{{ item.0 }}" + dest: "{{ item.1 }}" + owner: root + group: root + mode: 0755 with_items: - { 0: 'gateway/iiab-gen-iptables', 1: '/usr/bin/iiab-gen-iptables' } -- name: Add 'squid' to service list - ini_file: dest='{{ service_filelist }}' - section=squid - option='{{ item.option }}' - value='{{ item.value }}' +- name: Add 'squid' to list of services at /etc/iiab/iiab.ini + ini_file: + dest: "{{ service_filelist }}" + section: squid + option: "{{ item.option }}" + value: "{{ item.value }}" with_items: - option: enabled value: "{{ squid_enabled }}" -- name: Add 'dansguardian' to service list - ini_file: dest='{{ service_filelist }}' - section=dansguardian - option='{{ item.option }}' - value='{{ item.value }}' +- name: Add 'dansguardian' to list of services at /etc/iiab/iiab.ini + ini_file: + dest: "{{ service_filelist }}" + section: dansguardian + option: "{{ item.option }}" + value: "{{ item.value }}" with_items: - option: enabled value: "{{ dansguardian_enabled }}" -- name: Add 'wondershaper' to service list - ini_file: dest='{{ service_filelist }}' - section=wondershaper - option='{{ item.option }}' - value='{{ item.value }}' +- name: Add 'wondershaper' to list of services at /etc/iiab/iiab.ini + ini_file: + dest: "{{ service_filelist }}" + section: wondershaper + option: "{{ item.option }}" + value: "{{ item.value }}" with_items: - option: enabled value: "{{ wondershaper_enabled }}" From 281e0de7917076005da5c6348e3be99935dd4e3c Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 12 Jul 2018 13:51:59 -0400 Subject: [PATCH 04/13] Update enable_services.yml --- roles/network/tasks/enable_services.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index e7d0e403b..ba232df08 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -31,9 +31,9 @@ group: root mode: "{{ item.mode }}" with_items: - - { src: 'named/named-iiab.conf.j2' , dest: '/etc/named-iiab.conf' , mode: '0644' } - - { src: 'named/school.local.zone.db' , dest: '/var/named-iiab/' , mode: '0644' } - - { src: 'named/school.internal.zone.db' , dest: '/var/named-iiab/' , mode: '0644' } + - { src: 'named/named-iiab.conf.j2', dest: '/etc/named-iiab.conf', mode: '0644' } + - { src: 'named/school.local.zone.db', dest: '/var/named-iiab/', mode: '0644' } + - { src: 'named/school.internal.zone.db', dest: '/var/named-iiab/', mode: '0644' } - name: Enable named service service: From 14678e812186a1f9c120d12e2373386ebf20482f Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 12 Jul 2018 13:57:47 -0400 Subject: [PATCH 05/13] Update default_vars.yml --- vars/default_vars.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 1734e1228..1623e4a7b 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -103,9 +103,6 @@ dhcpd_enabled: False named_install: True named_enabled: True block_DNS: False -# Captive Portal highly experimental as of July 2018: https://github.com/iiab/iiab/pull/870 -py_captive_portal_install: True -py_captive_portal_enabled: False # dnsmasq dnsmasq_install: True @@ -115,6 +112,10 @@ dnsmasq_enabled: False captive_portal_install: False captive_portal_enabled: False +# Captive Portal highly experimental as of July 2018: https://github.com/iiab/iiab/pull/870 +py_captive_portal_install: True +py_captive_portal_enabled: False + # Squid squid_install: False squid_enabled: False From eb1f6a5dcca1670bd9534ceb2f755223229bbd51 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 12 Jul 2018 14:04:52 -0400 Subject: [PATCH 06/13] Update enable_services.yml --- roles/network/tasks/enable_services.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index ba232df08..c4b2fac76 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -100,16 +100,16 @@ mode: "{{ item.mode }}" with_items: - src: squid/squid-iiab.conf.j2 - dest: '/etc/{{ proxy }}/squid-iiab.conf' - owner: '{{ proxy_user }}' - group: '{{ proxy_user }}' + dest: "/etc/{{ proxy }}/squid-iiab.conf" + owner: "{{ proxy_user }}" + group: "{{ proxy_user }}" mode: 0644 when: squid_enabled and squid_install - name: Point to Squid config file from startup file lineinfile: regexp: '^CONFIG' - line: 'CONFIG=/etc/{{ proxy }}/squid-iiab.conf' + line: "CONFIG=/etc/{{ proxy }}/squid-iiab.conf" dest: "/etc/init.d/{{ proxy }}" when: squid_enabled and squid_install and is_debuntu @@ -170,7 +170,7 @@ - option: enabled value: "{{ dansguardian_enabled }}" -- name: Add 'wondershaper' to list of services at /etc/iiab/iiab.ini +- name: Add 'wondershaper' to list of services at /etc/iiab/iiab.ini ini_file: dest: "{{ service_filelist }}" section: wondershaper From b0aea6e1369a2878d13a7702dbd8d73d1a38a797 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 12 Jul 2018 14:10:34 -0400 Subject: [PATCH 07/13] Update main.yml --- roles/network/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml index a6a7cc8b4..61f622f03 100644 --- a/roles/network/defaults/main.yml +++ b/roles/network/defaults/main.yml @@ -62,7 +62,7 @@ network_config_dir: /etc/network/interfaces.d dns_jail_enabled: False services_externally_visible: False -# Following variables set for old apache, dhcpd, named usage +# Following variables set for old Apache, dhcpd, named usage dhcpd_install: True dhcpd_enabled: True named_install: True @@ -70,10 +70,10 @@ named_enabled: True dnsmasq_enabled: False dnsmasq_install: False -# Possibly useful Tim's earlier Nodogsplash (github.com/iiab/iiab/issues/826) +# For @tim-moody's Nodogsplash approach to Captive Portal? High experimental as of June 2018: github.com/iiab/iiab/issues/608 captive_portal_enabled: False -# For simple python Captive Portal (for Anish & Jerry's github.com/iiab/iiab/pull/870) +# Simple python Captive Portal, that @m-anish & @jvonau are experimenting with in July 2018: github.com/iiab/iiab/pull/870 py_captive_portal_install: True py_captive_portal_enabled: True py_captive_portal_port: "9090" From a4a882c5d079091e1fb83a2ae2636ab7a283773b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 12 Jul 2018 14:19:43 -0400 Subject: [PATCH 08/13] Update default_vars.yml --- vars/default_vars.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 1623e4a7b..3e08a701b 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -52,8 +52,9 @@ local_tz: "{{ ansible_date_time.tz }}" # Read https://github.com/iiab/iiab/wiki/IIAB-Networking # Also readable offline @ http://box/info/IIAB-Networking.html -# NETWORK PARAMETERS FOLLOW ACROSS THE NEXT 60 LINES, as enabled by Ansible's -# NETWORK role (/opt/iiab/iiab/roles/network/*) in 4-SERVER-OPTIONS. +# NETWORK PARAMETERS FOLLOW ACROSS THE NEXT 65 LINES, as enabled by Ansible's +# NETWORK role (/opt/iiab/iiab/roles/network/*) in 4-SERVER-OPTIONS below. +# SEE ALSO: /opt/iiab/iiab/roles/network/defaults/main.yml iiab_hostname: box iiab_domain: lan @@ -108,11 +109,11 @@ block_DNS: False dnsmasq_install: True dnsmasq_enabled: False -# Captive Portal highly experimental as of June 2018: https://github.com/iiab/iiab/issues/608 +# For @tim-moody's Nodogsplash approach to Captive Portal? High experimental as of June 2018: github.com/iiab/iiab/issues/608 captive_portal_install: False captive_portal_enabled: False -# Captive Portal highly experimental as of July 2018: https://github.com/iiab/iiab/pull/870 +# Simple python Captive Portal, that @m-anish & @jvonau are experimenting with in July 2018: github.com/iiab/iiab/pull/870 py_captive_portal_install: True py_captive_portal_enabled: False From db360cd759a761806d6f864dc87ff9a74c4170bd Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 12 Jul 2018 18:13:58 -0400 Subject: [PATCH 09/13] comment fixed: ./runtags -> ./runrole --- roles/wordpress/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wordpress/tasks/install.yml b/roles/wordpress/tasks/install.yml index 2fcdf7868..fa794dd3c 100644 --- a/roles/wordpress/tasks/install.yml +++ b/roles/wordpress/tasks/install.yml @@ -2,7 +2,7 @@ # to /library/wordpress) should also work offline... # # ONLINE OR OFFLINE, IF YOU NEED A CLEAN REINSTALL OF WORDPRESS DURING YOUR -# NEXT RUN OF "./runtags wordpress" OR "./iiab-install" PLEASE FIRST DO: +# NEXT RUN OF "./runrole wordpress" OR "./iiab-install" PLEASE FIRST DO: # # - "mv /library/wordpress /library/wordpress.old" # - back up WordPress's database then drop it From 52c612bf94ca2534b030d416ccadf814641dcd1e Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 12 Jul 2018 21:04:04 -0400 Subject: [PATCH 10/13] Update main.yml --- roles/sugarizer/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 7eecf12cf..b5914dae5 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -12,6 +12,7 @@ dest: "{{ sugarizer_location }}/{{ sugarizer_version }}" version: "{{ sugarizer_git_version }}" force: yes + depth: 1 when: internet_available - name: Create symbolic link /opt/iiab/sugarizer -> /opt/iiab/{{ sugarizer_version }} @@ -36,6 +37,7 @@ dest: "{{ sugarizer_location }}/{{ sugarizer_server_version }}" version: "{{ sugarizer_server_git_version }}" force: yes + depth: 1 when: internet_available - name: Create symbolic link /opt/iiab/sugarizer-server -> /opt/iiab/{ sugarizer_server_version }} From f405ceb8c858cd58b8c3ec6823853b0f9e9641d9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 12 Jul 2018 21:33:25 -0400 Subject: [PATCH 11/13] delete link properly --- roles/httpd/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index de04af0f0..848a42fa2 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -53,7 +53,6 @@ - name: Remove the default apache2 config file (debuntu) file: path: /etc/apache2/sites-enabled/000-default.conf - src: /etc/apache2/sites-available/000-default.conf state: absent when: is_debuntu From b6c97719fd9e039e1c6b5280c10d4deddc710728 Mon Sep 17 00:00:00 2001 From: Arky Date: Fri, 13 Jul 2018 00:02:05 +0700 Subject: [PATCH 12/13] Kiwix-tools code for i586 Correct handling of i586/i686 kiwix-tools binaries. --- roles/kiwix/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index 575f35513..53ae419d4 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -2,8 +2,8 @@ # As obtained from http://download.kiwix.org/release/kiwix-tools/ or http://download.kiwix.org/nightly/ kiwix_version_armhf: "kiwix-tools_linux-armhf-0.6.0" -kiwix_version_linux64: "kiwix-tools_linux-i586-0.6.0" -kiwix_version_i686: "kiwix-tools_linux-x86_64-0.6.0" +kiwix_version_i686: "kiwix-tools_linux-i586-0.6.0" +kiwix_version_linux64: "kiwix-tools_linux-x86_64-0.6.0" # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2" # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content") # v0.10 for i686 published Oct 2016 ("experimental") REPLACED IN EARLY 2018, thx to Matthieu Gautier: From 56a17bfcf2f7d47aafa4b5baaccafb1d270ec560 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 13 Jul 2018 09:12:09 -0400 Subject: [PATCH 13/13] Update main.yml --- 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 53ae419d4..a1425982b 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -2,8 +2,8 @@ # As obtained from http://download.kiwix.org/release/kiwix-tools/ or http://download.kiwix.org/nightly/ kiwix_version_armhf: "kiwix-tools_linux-armhf-0.6.0" -kiwix_version_i686: "kiwix-tools_linux-i586-0.6.0" kiwix_version_linux64: "kiwix-tools_linux-x86_64-0.6.0" +kiwix_version_i686: "kiwix-tools_linux-i586-0.6.0" # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2" # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content") # v0.10 for i686 published Oct 2016 ("experimental") REPLACED IN EARLY 2018, thx to Matthieu Gautier: