From 3d850253e8b5e073c1467df76235170e18a29b08 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 31 Jan 2019 12:56:16 -0500 Subject: [PATCH 1/4] Update packages.yml --- roles/2-common/tasks/packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml index 34b521136..f9b93328a 100644 --- a/roles/2-common/tasks/packages.yml +++ b/roles/2-common/tasks/packages.yml @@ -18,7 +18,7 @@ apt: deb: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb" #timeout: "{{ download_timeout }}" # Ansible's apt module doesn't support timeout parameter; that's ok as usbmount_0.0.14.1_all.deb is only 10KB - when: internet_available and is_debian_9 or is_debian_10 and not is_raspbian_9 + when: internet_available and (is_debian_9 or is_debian_10) and not is_rpi - name: "Install 7 deb/apt packages: avahi-daemon, avahi-discover, exfat-fuse, exfat-utils, inetutils-syslogd, libnss-mdns, wpasupplicant (debuntu)" package: From 1f8c3f78cb1ea7865090a987439aa8fe28bbc761 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 31 Jan 2019 14:29:19 -0500 Subject: [PATCH 2/4] Update computed_services.yml --- roles/network/tasks/computed_services.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/network/tasks/computed_services.yml b/roles/network/tasks/computed_services.yml index de67c7c97..df62d91f7 100644 --- a/roles/network/tasks/computed_services.yml +++ b/roles/network/tasks/computed_services.yml @@ -62,7 +62,7 @@ value: "{{ squid_enabled }}" - option: wondershaper_enabled value: "{{ wondershaper_enabled }}" - - option: iiab_network_mode(applied) + - option: iiab_network_mode_applied value: "{{ iiab_network_mode }}" - option: dhcpd_enabled value: "{{ dhcpd_enabled }}" @@ -72,5 +72,5 @@ value: "{{ named_enabled }}" - option: dnsmasq_enabled value: "{{ dnsmasq_enabled }}" -# - option: no_net_restart -# value: "{{ no_net_restart }}" + - option: no_net_restart + value: "{{ no_net_restart }}" From e4a1e13b067fbdab7c5e66256ded31d897eabd96 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 31 Jan 2019 14:35:11 -0500 Subject: [PATCH 3/4] open calibreweb_port (8083) requested by @m-anish --- 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 8ced09eb7..37e10452c 100755 --- a/roles/network/templates/gateway/iiab-gen-iptables +++ b/roles/network/templates/gateway/iiab-gen-iptables @@ -55,6 +55,7 @@ gui_port={{ gui_port }} iiab_gateway_enabled={{ iiab_gateway_enabled }} services_externally_visible={{ services_externally_visible }} calibre_port={{ calibre_port }} +calibreweb_port={{ calibreweb_port }} kiwix_port={{ kiwix_port }} kalite_server_port={{ kalite_server_port }} kolibri_http_port={{ kolibri_http_port }} @@ -96,6 +97,7 @@ if [ "$services_externally_visible" == "True" ]; then $IPTABLES -A INPUT -p tcp --dport $kalite_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 $calibreweb_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $cups_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 $IPTABLES -A INPUT -p tcp --dport $nodered_port -m state --state NEW -i $wan -j ACCEPT From 04c8c99a3db3f70f21a9cd9683dc1c4b7e1538da Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 31 Jan 2019 18:09:08 -0500 Subject: [PATCH 4/4] usbmount 0.0.14.1 comment clarified --- roles/2-common/tasks/packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml index f9b93328a..348fa0524 100644 --- a/roles/2-common/tasks/packages.yml +++ b/roles/2-common/tasks/packages.yml @@ -14,7 +14,7 @@ state: present when: is_redhat -- name: Install {{ iiab_download_url }}/usbmount_0.0.14.1_all.deb, missing from Debian (debian-9, debian-10 and not raspbian-9) +- name: Install {{ iiab_download_url }}/usbmount_0.0.14.1_all.deb, missing from Debian (debian-9 or debian-10, if NOT rpi) apt: deb: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb" #timeout: "{{ download_timeout }}" # Ansible's apt module doesn't support timeout parameter; that's ok as usbmount_0.0.14.1_all.deb is only 10KB