Merge pull request #896 from holta/local_vars-default_vars-updates

Update local_vars.yml and default_vars.yml defaults

vars/default_vars.yml

@@ -109,6 +109,8 @@ block_DNS: False
 dnsmasq_install: True
 dnsmasq_enabled: False
 
+dns_jail_enabled: False
+
 # 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
@@ -163,8 +165,8 @@ schooltool_enabled: False
 
 # 3-BASE-SERVER
 
-# Needed if you want http://box/common/services/power_off.php to work
-allow_apache_sudo: False
+# Make this False to disable http://box/common/services/power_off.php button:
+allow_apache_sudo: True
 
 # roles/httpd runs here
 

vars/local_vars_big.yml

@@ -39,8 +39,6 @@ host_channel: 6
 hostapd_secure: False
 hostapd_password: changeme
 
-dns_jail_enabled: False
-
 # Enables "campus access" to kiwix (3000), kalite (8008) & calibre (8010 or
 # 8080) on WAN side of server. See network/templates/gateway/iiab-gen-iptables
 # within github.com/iiab/iiab/blob/master/roles/
@@ -49,8 +47,15 @@ services_externally_visible: True
 # Make this True if client machines should have access to WAN/Internet:
 iiab_gateway_enabled: False
 
-# Make this False to disable http://box/common/services/power_off.php button:
-allow_apache_sudo: True
+# dnsmasq
+dnsmasq_install: True
+dnsmasq_enabled: False
+
+dns_jail_enabled: False
+
+# 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
 
 # Stages 3 & 4 must be run (using iiab-install or runrole) if changing these:
 squid_install: True
@@ -69,6 +74,9 @@ dansguardian_enabled: True
 
 # 3-BASE-SERVER
 
+# Make this False to disable http://box/common/services/power_off.php button:
+allow_apache_sudo: True
+
 # roles/mysql runs here (mandatory)
 
 # 4-SERVER-OPTIONS

vars/local_vars_big_vpn.yml

@@ -39,8 +39,6 @@ host_channel: 6
 hostapd_secure: False
 hostapd_password: changeme
 
-dns_jail_enabled: False
-
 # Enables "campus access" to kiwix (3000), kalite (8008) & calibre (8010 or
 # 8080) on WAN side of server. See network/templates/gateway/iiab-gen-iptables
 # within github.com/iiab/iiab/blob/master/roles/
@@ -49,8 +47,15 @@ services_externally_visible: True
 # Make this True if client machines should have access to WAN/Internet:
 iiab_gateway_enabled: False
 
-# Make this False to disable http://box/common/services/power_off.php button:
-allow_apache_sudo: True
+# dnsmasq
+dnsmasq_install: True
+dnsmasq_enabled: False
+
+dns_jail_enabled: False
+
+# 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
 
 # Stages 3 & 4 must be run (using iiab-install or runrole) if changing these:
 squid_install: True
@@ -69,6 +74,9 @@ dansguardian_enabled: True
 
 # 3-BASE-SERVER
 
+# Make this False to disable http://box/common/services/power_off.php button:
+allow_apache_sudo: True
+
 # roles/mysql runs here (mandatory)
 
 # 4-SERVER-OPTIONS

vars/local_vars_medium.yml

@@ -39,8 +39,6 @@ host_channel: 6
 hostapd_secure: False
 hostapd_password: changeme
 
-dns_jail_enabled: False
-
 # Enables "campus access" to kiwix (3000), kalite (8008) & calibre (8010 or
 # 8080) on WAN side of server. See network/templates/gateway/iiab-gen-iptables
 # within github.com/iiab/iiab/blob/master/roles/
@@ -49,8 +47,15 @@ services_externally_visible: True
 # Make this True if client machines should have access to WAN/Internet:
 iiab_gateway_enabled: False
 
-# Make this False to disable http://box/common/services/power_off.php button:
-allow_apache_sudo: True
+# dnsmasq
+dnsmasq_install: True
+dnsmasq_enabled: False
+
+dns_jail_enabled: False
+
+# 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
 
 # Stages 3 & 4 must be run (using iiab-install or runrole) if changing these:
 squid_install: False
@@ -69,6 +74,9 @@ dansguardian_enabled: False
 
 # 3-BASE-SERVER
 
+# Make this False to disable http://box/common/services/power_off.php button:
+allow_apache_sudo: True
+
 # roles/mysql runs here (mandatory)
 
 # 4-SERVER-OPTIONS

vars/local_vars_medium_vpn.yml

@@ -39,8 +39,6 @@ host_channel: 6
 hostapd_secure: False
 hostapd_password: changeme
 
-dns_jail_enabled: False
-
 # Enables "campus access" to kiwix (3000), kalite (8008) & calibre (8010 or
 # 8080) on WAN side of server. See network/templates/gateway/iiab-gen-iptables
 # within github.com/iiab/iiab/blob/master/roles/
@@ -49,8 +47,15 @@ services_externally_visible: True
 # Make this True if client machines should have access to WAN/Internet:
 iiab_gateway_enabled: False
 
-# Make this False to disable http://box/common/services/power_off.php button:
-allow_apache_sudo: True
+# dnsmasq
+dnsmasq_install: True
+dnsmasq_enabled: False
+
+dns_jail_enabled: False
+
+# 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
 
 # Stages 3 & 4 must be run (using iiab-install or runrole) if changing these:
 squid_install: False
@@ -69,6 +74,9 @@ dansguardian_enabled: False
 
 # 3-BASE-SERVER
 
+# Make this False to disable http://box/common/services/power_off.php button:
+allow_apache_sudo: True
+
 # roles/mysql runs here (mandatory)
 
 # 4-SERVER-OPTIONS

vars/local_vars_min.yml

@@ -31,7 +31,7 @@ iiab_domain: lan
 # Set to /home or /wordpress or /mediawiki or /wiki (for DokuWiki)
 iiab_home_url: /home
 
-# Raspbian requires WiFi country since March 2018.  Please set it here:
+# Raspbian requires Wi-Fi country since March 2018.  Please set it here:
 host_country_code: US
 host_ssid: "Internet in a Box"
 host_wifi_mode: g
@@ -39,8 +39,6 @@ host_channel: 6
 hostapd_secure: False
 hostapd_password: changeme
 
-dns_jail_enabled: False
-
 # Enables "campus access" to kiwix (3000), kalite (8008) & calibre (8010 or
 # 8080) on WAN side of server. See network/templates/gateway/iiab-gen-iptables
 # within github.com/iiab/iiab/blob/master/roles/
@@ -49,8 +47,15 @@ services_externally_visible: True
 # Make this True if client machines should have access to WAN/Internet:
 iiab_gateway_enabled: False
 
-# Make this False to disable http://box/common/services/power_off.php button:
-allow_apache_sudo: True
+# dnsmasq
+dnsmasq_install: True
+dnsmasq_enabled: False
+
+dns_jail_enabled: False
+
+# 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
 
 # Stages 3 & 4 must be run (using iiab-install or runrole) if changing these:
 squid_install: False
@@ -69,6 +74,9 @@ dansguardian_enabled: False
 
 # 3-BASE-SERVER
 
+# Make this False to disable http://box/common/services/power_off.php button:
+allow_apache_sudo: True
+
 # roles/mysql runs here (mandatory)
 
 # 4-SERVER-OPTIONS

vars/local_vars_min_vpn.yml

@@ -39,8 +39,6 @@ host_channel: 6
 hostapd_secure: False
 hostapd_password: changeme
 
-dns_jail_enabled: False
-
 # Enables "campus access" to kiwix (3000), kalite (8008) & calibre (8010 or
 # 8080) on WAN side of server. See network/templates/gateway/iiab-gen-iptables
 # within github.com/iiab/iiab/blob/master/roles/
@@ -49,8 +47,15 @@ services_externally_visible: True
 # Make this True if client machines should have access to WAN/Internet:
 iiab_gateway_enabled: False
 
-# Make this False to disable http://box/common/services/power_off.php button:
-allow_apache_sudo: True
+# dnsmasq
+dnsmasq_install: True
+dnsmasq_enabled: False
+
+dns_jail_enabled: False
+
+# 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
 
 # Stages 3 & 4 must be run (using iiab-install or runrole) if changing these:
 squid_install: False
@@ -69,6 +74,9 @@ dansguardian_enabled: False
 
 # 3-BASE-SERVER
 
+# Make this False to disable http://box/common/services/power_off.php button:
+allow_apache_sudo: True
+
 # roles/mysql runs here (mandatory)
 
 # 4-SERVER-OPTIONS