Merge pull request #481 from iiab/master

Sync from iiab/iiab:master

roles/network/tasks/rpi_debian.yml

@@ -68,7 +68,7 @@
     state: restarted
   when: iiab_wired_lan_iface is defined
 
-- name: Restart hostapd when WiFi is present but not when using WiFi as gateway 
+- name: Restart hostapd when WiFi is present but not when using WiFi as gateway with wifi_up_down False
   systemd:
     name: hostapd
     state: restarted

roles/network/tasks/sysd-netd-debian.yml

@@ -62,7 +62,7 @@
     name: systemd-networkd
     state: restarted
 
-- name: Restart hostapd when WiFi is present but not when using WiFi as gateway$
+- name: Restart hostapd when WiFi is present but not when using WiFi as gateway with wifi_up_down False
   systemd:
     name: hostapd
     state: restarted

roles/network/templates/gateway/iiab-gen-iptables

@@ -45,7 +45,6 @@ echo -e "WAN: $wan\n"
 
 # "Good thing we replace this file; should be treated like Squid below" ?
 ports_externally_visible={{ ports_externally_visible }}
-#services_externally_visible= [deprecated]
 gw_block_https={{ gw_block_https }}
 sshd_port={{ sshd_port }}
 #gui_wan= [no longer needed]

roles/network/templates/gateway/iiab-internet-off

@@ -4,8 +4,12 @@ sed -i -e "s/^IIAB_GATEWAY_ENABLED.*/IIAB_GATEWAY_ENABLED=False/" {{ iiab_env_fi
 
 cat << EOF
 
+IIAB Firewall Documentation
+http://box.lan/info/IIAB-Networking.html#firewall-iptables
+https://github.com/iiab/iiab/wiki/IIAB-Networking#firewall-iptables
+
 WARNING: If you want to _permanently_ change your IIAB's default behavior
-(i.e. to specify whether student client devices should have Internet or not,
+(i.e. to specify whether student/client devices should have Internet or not,
 in general!) then modify variable 'iiab_gateway_enabled' in
 /etc/iiab/local_vars.yml — and finally run 'cd /opt/iiab/iiab ; ./iiab-network'
 EOF

roles/network/templates/gateway/iiab-internet-on

@@ -4,8 +4,12 @@ sed -i -e "s/^IIAB_GATEWAY_ENABLED.*/IIAB_GATEWAY_ENABLED=True/" {{ iiab_env_fil
 
 cat << EOF
 
+IIAB Firewall Documentation
+http://box.lan/info/IIAB-Networking.html#firewall-iptables
+https://github.com/iiab/iiab/wiki/IIAB-Networking#firewall-iptables
+
 WARNING: If you want to _permanently_ change your IIAB's default behavior
-(i.e. to specify whether student client devices should have Internet or not,
+(i.e. to specify whether student/client devices should have Internet or not,
 in general!) then modify variable 'iiab_gateway_enabled' in
 /etc/iiab/local_vars.yml — and finally run 'cd /opt/iiab/iiab ; ./iiab-network'
 EOF