From 16e2cccec37d1c55e91b37f2305cbb1ea98c14f3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:05:49 -0400 Subject: [PATCH 01/13] Update iiab-gen-iptables --- roles/network/templates/gateway/iiab-gen-iptables | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/network/templates/gateway/iiab-gen-iptables b/roles/network/templates/gateway/iiab-gen-iptables index 0e456dab1..9130b6e49 100755 --- a/roles/network/templates/gateway/iiab-gen-iptables +++ b/roles/network/templates/gateway/iiab-gen-iptables @@ -57,6 +57,7 @@ services_externally_visible={{ services_externally_visible }} calibre_port={{ calibre_port }} kiwix_port={{ kiwix_port }} kalite_server_port={{ kalite_server_port }} +kolibri_port={{ kolibri_port }} sugarizer_port={{ sugarizer_port }} block_DNS={{ block_DNS }} captive_portal_enabled={{ captive_portal_enabled }} @@ -90,6 +91,7 @@ fi if [ "$services_externally_visible" == "True" ]; then $IPTABLES -A INPUT -p tcp --dport $kiwix_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $kalite_server_port -m state --state NEW -i $wan -j ACCEPT + $IPTABLES -A INPUT -p tcp --dport $kolibri_server_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $calibre_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $sugarizer_port -m state --state NEW -i $wan -j ACCEPT fi From 3c031c88a3d048c2866bf03d8212e3306bf2aecb Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:10:37 -0400 Subject: [PATCH 02/13] Update iiab-gen-iptables --- roles/network/templates/gateway/iiab-gen-iptables | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/templates/gateway/iiab-gen-iptables b/roles/network/templates/gateway/iiab-gen-iptables index 9130b6e49..b3ce923b2 100755 --- a/roles/network/templates/gateway/iiab-gen-iptables +++ b/roles/network/templates/gateway/iiab-gen-iptables @@ -57,7 +57,7 @@ services_externally_visible={{ services_externally_visible }} calibre_port={{ calibre_port }} kiwix_port={{ kiwix_port }} kalite_server_port={{ kalite_server_port }} -kolibri_port={{ kolibri_port }} +kolibri_http_port={{ kolibri_http_port }} sugarizer_port={{ sugarizer_port }} block_DNS={{ block_DNS }} captive_portal_enabled={{ captive_portal_enabled }} @@ -91,7 +91,7 @@ fi if [ "$services_externally_visible" == "True" ]; then $IPTABLES -A INPUT -p tcp --dport $kiwix_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $kalite_server_port -m state --state NEW -i $wan -j ACCEPT - $IPTABLES -A INPUT -p tcp --dport $kolibri_server_port -m state --state NEW -i $wan -j ACCEPT + $IPTABLES -A INPUT -p tcp --dport $kolibri_http_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $calibre_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $sugarizer_port -m state --state NEW -i $wan -j ACCEPT fi From eaf878e08f2f0065b2fbd932663b7de501ec255c Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:11:46 -0400 Subject: [PATCH 03/13] Update default_vars.yml --- vars/default_vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 05cc37f58..ce69cc687 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -316,6 +316,7 @@ kalite_password: kalite # Kolibri kolibri_install: False kolibri_enabled: False +kolibri_http_port: 8009 # Kiwix kiwix_install: True From d473921cb759229ce571ce914d37a50cc16c3fff Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:12:24 -0400 Subject: [PATCH 04/13] Update local_vars_min.yml --- vars/local_vars_min.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 6ca4dcb05..812e6d0a5 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -172,6 +172,7 @@ kalite_cron_enabled: True kolibri_install: False kolibri_enabled: False +kolibri_http_port: 8009 kiwix_install: True kiwix_enabled: True From 60ceb2f1957d2679b9717e5f073f11c241ab75d8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:16:44 -0400 Subject: [PATCH 05/13] Update local_vars_min.yml --- vars/local_vars_min.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 812e6d0a5..6ca4dcb05 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -172,7 +172,6 @@ kalite_cron_enabled: True kolibri_install: False kolibri_enabled: False -kolibri_http_port: 8009 kiwix_install: True kiwix_enabled: True From be2a9eb1ac67287c03a484f5a14c154a6f845d54 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:23:43 -0400 Subject: [PATCH 06/13] Update iiab-gen-iptables --- roles/network/templates/gateway/iiab-gen-iptables | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/templates/gateway/iiab-gen-iptables b/roles/network/templates/gateway/iiab-gen-iptables index b3ce923b2..812fe1b39 100755 --- a/roles/network/templates/gateway/iiab-gen-iptables +++ b/roles/network/templates/gateway/iiab-gen-iptables @@ -63,7 +63,7 @@ block_DNS={{ block_DNS }} captive_portal_enabled={{ captive_portal_enabled }} py_captive_portal_enabled={{ py_captive_portal_enabled }} -echo "Lan is $lan and WAN is $wan" +echo "LAN is $lan and WAN is $wan" # # delete all existing rules. # From 44c1c0293ad88c45368ec3c36ef9661d680ba520 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:41:51 -0400 Subject: [PATCH 07/13] Update restart.yml --- roles/network/tasks/restart.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml index 30aa4b307..6a60ec235 100644 --- a/roles/network/tasks/restart.yml +++ b/roles/network/tasks/restart.yml @@ -1,4 +1,4 @@ -- name: restart hostapd when wifi is present +- name: Restart hostapd when WiFi is present systemd: name: hostapd state: restarted From 7790fd6624c5d8212761854c5e186f2475788d18 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:48:19 -0400 Subject: [PATCH 08/13] Update ifcfg_mods.yml --- roles/network/tasks/ifcfg_mods.yml | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/roles/network/tasks/ifcfg_mods.yml b/roles/network/tasks/ifcfg_mods.yml index b5a3f5f9c..ce47f5133 100644 --- a/roles/network/tasks/ifcfg_mods.yml +++ b/roles/network/tasks/ifcfg_mods.yml @@ -26,16 +26,22 @@ with_items: - "{{ discovered_lan_iface }}" -- name: bind may be affected - service: name={{ dns_service }} state=stopped +- name: BIND may be affected + service: + name: "{{ dns_service }}" + state: stopped when: named_install and dnsmasq_enabled - name: dhcpd_server may be affected - stopping dhcpd - service: name=dhcpd state=stopped + service: + name: dhcpd + state: stopped when: dhcpd_install - name: dhcpd_server may be affected - stopping dnsmasq - service: name=dnsmasq state=stopped + service: + name: dnsmasq + state: stopped when: dnsmasq_install - name: Stop the LAN/Bridge deleting iiab-LAN @@ -65,15 +71,17 @@ # can be more than one wired interface - name: Wired enslaving ## lan_list_result ## to Bridge - template: src=network/ifcfg-slave.j2 - dest=/etc/sysconfig/network-scripts/ifcfg-{{ item|trim }} + template: + src: network/ifcfg-slave.j2 + dest: "/etc/sysconfig/network-scripts/ifcfg-{{ item|trim }}" when: iiab_lan_iface == "br0" and item|trim != iiab_wireless_lan_iface and item|trim != iiab_wan_iface with_items: - - "{{ lan_list_result.stdout_lines }}" + - "{{ lan_list_result.stdout_lines }}" - name: WiFi enslaving {{ iiab_wireless_lan_iface }} to Bridge - template: src=network/wifi-slave.j2 - dest=/etc/sysconfig/network-scripts/ifcfg-{{ iiab_wireless_lan_iface }} + template: + src: network/wifi-slave.j2 + dest: "/etc/sysconfig/network-scripts/ifcfg-{{ iiab_wireless_lan_iface }}" when: iiab_lan_iface == "br0" and iiab_wireless_lan_iface != "none" tags: - network @@ -81,7 +89,7 @@ - include_tasks: enable_wan.yml when: not installing and not iiab_demo_mode -- name: ask systemd to reread the unit files, picks up changes done +- name: Ask systemd to reread the unit files, picks up changes done systemd: daemon_reload: yes when: not installing @@ -111,7 +119,7 @@ ignore_errors: True when: iiab_lan_iface == "br0" and item|trim != iiab_wireless_lan_iface and item|trim != iiab_wan_iface and not iiab_demo_mode with_items: - - "{{ lan_list_result.stdout_lines }}" + - "{{ lan_list_result.stdout_lines }}" #- name: restart hostapd when wifi is present # service: name=hostapd state=started From 74dca68882e22be3019e6547f9d75a52fd204e49 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:49:14 -0400 Subject: [PATCH 09/13] Update down-debian.yml --- roles/network/tasks/down-debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/down-debian.yml b/roles/network/tasks/down-debian.yml index 393d7fd4e..c5954a72a 100644 --- a/roles/network/tasks/down-debian.yml +++ b/roles/network/tasks/down-debian.yml @@ -5,7 +5,7 @@ # dest: /etc/resolvconf.conf # src: network/resolvconf.j2 -- name: bind may be affected +- name: BIND may be affected service: name: "{{ dns_service }}" state: stopped From 0247ee1930ad498d5d77011b4d8283645c77faad Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:54:14 -0400 Subject: [PATCH 10/13] Update debian.yml --- roles/network/tasks/debian.yml | 64 +++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml index 4ec38b22a..10ec29312 100644 --- a/roles/network/tasks/debian.yml +++ b/roles/network/tasks/debian.yml @@ -21,52 +21,64 @@ # state=present - name: For upgrades from earlier IIAB 6.2, remove br0 file - file: path=/etc/network/interfaces.d/br0 - state=absent + file: + path: /etc/network/interfaces.d/br0 + state: absent when: iiab_lan_iface != "br0" and wan_ip == "dhcp" - name: Supply resolvconf.conf - template: dest=/etc/resolvconf.conf - src=network/resolvconf.j2 + template: + dest: /etc/resolvconf.conf + src: network/resolvconf.j2 - name: Supply dhcpcd.conf - template: dest=/etc/dhcpcd.conf - src=network/dhcpcd.conf.j2 + template: + dest: /etc/dhcpcd.conf + src: network/dhcpcd.conf.j2 when: dhcpcd_result == "enabled" - name: Copy the bridge script - template: dest=/etc/network/interfaces.d/iiab - src=network/systemd.j2 + template: + dest: /etc/network/interfaces.d/iiab + src: network/systemd.j2 when: not is_rpi and (iiab_lan_iface == "br0" or wan_ip != "dhcp" or gui_static_wan_ip == "undefined") - name: Copy the bridge script for RPi - template: dest=/etc/network/interfaces.d/iiab - src=network/rpi.j2 + template: + dest: /etc/network/interfaces.d/iiab + src: network/rpi.j2 when: is_rpi and iiab_lan_iface == "br0" -- name: Workaround auto issue on Debian-9 - template: dest=/etc/network/interfaces.d/patch_auto - src=network/debian-auto.j2 +- name: Workaround auto issue (debian-9) + template: + dest: /etc/network/interfaces.d/patch_auto + src: network/debian-auto.j2 when: iiab_wan_iface != "none" and is_debian_9 -- name: Clearing out /etc/network/interfaces for static addresses (is_debian_9) +- name: Clearing out /etc/network/interfaces for static addresses (debian-9) lineinfile: - state: absent - path: /etc/network/interfaces - regexp: "{{ iiab_wan_iface }}" + state: absent + path: /etc/network/interfaces + regexp: "{{ iiab_wan_iface }}" when: wan_ip != "dhcp" and iiab_wan_iface != "none" and is_debian_9 -- name: bind may be affected - service: name={{ dns_service }} state=stopped +- name: BIND may be affected + service: + name: "{{ dns_service }}" + state: stopped when: named_install and dnsmasq_enabled # dhcpd_server release the interface - name: dhcpd_server may be affected - stopping dhcpd - service: name=dhcpd state=stopped + service: + name: dhcpd + state: stopped when: dhcpd_install -- name: dhcpd_server may be affected - stopping dnsmasq - service: name=dnsmasq state=stopped +- name: dnsmasq may be affected - stopping dnsmasq + service: + name: dnsmasq + state: stopped when: dnsmasq_install - name: Reload systemd @@ -75,9 +87,13 @@ # now pick up denyinterfaces - name: Restart dhcpcd - service: name=dhcpcd state=restarted + service: + name: dhcpcd + state: restarted when: dhcpcd_result == "enabled" - name: Restart the networking service - service: name=networking state=restarted + service: + name: networking + state: restarted when: not nobridge is defined and not no_net_restart From b3dbf16a2757a88fed2fcf5b85f9c5bf6ba94d78 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:56:14 -0400 Subject: [PATCH 11/13] Update ifcfg_mods.yml --- roles/network/tasks/ifcfg_mods.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/ifcfg_mods.yml b/roles/network/tasks/ifcfg_mods.yml index ce47f5133..444f3241f 100644 --- a/roles/network/tasks/ifcfg_mods.yml +++ b/roles/network/tasks/ifcfg_mods.yml @@ -65,8 +65,9 @@ # when: iiab_wan_iface != "none" and not has_WAN and has_ifcfg_gw == "none" and xo_model == "none" and not iiab_demo_mode - name: Configuring LAN interface as iiab_lan_iface - template: src=network/ifcfg.j2 - dest=/etc/sysconfig/network-scripts/ifcfg-LAN + template: + src: network/ifcfg.j2 + dest: /etc/sysconfig/network-scripts/ifcfg-LAN when: iiab_lan_iface != "none" # can be more than one wired interface From 51611524328200170a49e94750e43250f563b480 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 01:57:12 -0400 Subject: [PATCH 12/13] Update debian.yml --- roles/network/tasks/debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml index 10ec29312..f8222eee7 100644 --- a/roles/network/tasks/debian.yml +++ b/roles/network/tasks/debian.yml @@ -75,7 +75,7 @@ state: stopped when: dhcpd_install -- name: dnsmasq may be affected - stopping dnsmasq +- name: dhcpd_server may be affected - stopping dnsmasq service: name: dnsmasq state: stopped From 1d128593eeec0723471ec426e481d575549816f1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 02:01:01 -0400 Subject: [PATCH 13/13] Update debian.yml --- roles/network/tasks/debian.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml index f8222eee7..9eeddb4f6 100644 --- a/roles/network/tasks/debian.yml +++ b/roles/network/tasks/debian.yml @@ -71,8 +71,8 @@ # dhcpd_server release the interface - name: dhcpd_server may be affected - stopping dhcpd service: - name: dhcpd - state: stopped + name: dhcpd + state: stopped when: dhcpd_install - name: dhcpd_server may be affected - stopping dnsmasq