From f2ddcac90ad31aa78fbb1b26ba69d17c0b42c5e6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 25 May 2019 07:19:16 -0400 Subject: [PATCH] Making network/defaults/main.yml approachable for others --- roles/network/defaults/main.yml | 88 ++++++++++++++++----------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml index 1594474e8..01bcbc82f 100644 --- a/roles/network/defaults/main.yml +++ b/roles/network/defaults/main.yml @@ -1,6 +1,50 @@ # IIAB Networking Doc # https://github.com/iiab/iiab/wiki/IIAB-Networking +# Firewall (iptables) can be tuned in /etc/iiab/local_vars.yml with this var: +# ports_externally_visible: 3 +# https://github.com/iiab/iiab/wiki/IIAB-Networking#firewall-iptables + +# Wi-Fi +# host_country_code: US +# host_ssid: "Internet in a Box" +# host_wifi_mode: g +# host_channel: 6 +# hostapd_secure: False +# hostapd_password: changeme +# Above 6 vars set in /etc/iiab/local_vars.yml +# +# hostapd_enabled: True +# Above is forcibly set to False (in roles/network/tasks/main.yml) if IIAB is +# being WiFi-installed (run "iiab-hotspot-on" AFTER ./iiab-install completes +# and content is downloaded, to enable the internal WiFi Access Point / AP!) +# +# reboot_to_AP: False +# For those installing IIAB over WiFi: "reboot_to_AP: True" overrides the above +# detection of WiFi-as-gateway, forcing "hostapd_enabled: True" regardless. +# +# Above 2 vars set in /opt/iiab/iiab/vars/default_vars.yml +# +hostapd_wait: 5 +host_wireless_n: False +driver_name: nl80211 + +# DNS / name resolution +# dhcpd_install: False +# dhcpd_enabled: False +# named_install: False +# named_enabled: False +# dnsmasq_enabled: True +# dnsmasq_install: True +# dns_jail_enabled: False +# Above 7 vars set in /etc/iiab/local_vars.yml +# +# dhcp_service: ???? # Set in individual OS's /opt/iiab/iiab/vars/.yml for use in roles/network/tasks/dhcpd.yml +# dhcp_service2: "dhcpd disabled" # Moved to roles/network/tasks/computed_services.yml as community transitions from named/BIND to dnsmasq (PR #1202) + +# Dynamically calculated later +# iiab_network_mode: "Gateway" + # Defaults for network detection wireless_lan_present: False strict_networking: False @@ -41,53 +85,9 @@ gui_desired_network_role: Gateway wondershaper_dspeed: "4096" wondershaper_upspeed: "1024" -# Dynamically calculated later -# iiab_network_mode: "Gateway" - -# ports_externally_visible: 3 -# Above var set in /etc/iiab/local_vars.yml -# Instructions: https://github.com/iiab/iiab/wiki/IIAB-Networking#firewall-iptables - -# Wi-Fi -# host_country_code: US -# host_ssid: "Internet in a Box" -# host_wifi_mode: g -# host_channel: 6 -# hostapd_secure: False -# hostapd_password: changeme -# Above 6 vars set in /etc/iiab/local_vars.yml: (so implementer sets them) -# -# hostapd_enabled: True -# Above is forcibly set to False (in roles/network/tasks/main.yml) if IIAB is -# being WiFi-installed (run "iiab-hotspot-on" AFTER ./iiab-install completes -# and content is downloaded, to enable the internal WiFi Access Point / AP!) -# -# reboot_to_AP: False -# For those installing IIAB over WiFi: "reboot_to_AP: True" overrides the above -# detection of WiFi-as-gateway, forcing "hostapd_enabled: True" regardless. -# -# Above 2 vars set in /opt/iiab/iiab/vars/default_vars.yml -# -hostapd_wait: 5 -host_wireless_n: False -driver_name: nl80211 - # Unused # network_config_dir: /etc/network/interfaces.d -# DNS / name resolution -# dhcpd_install: False -# dhcpd_enabled: False -# named_install: True -# named_enabled: False -# dnsmasq_enabled: True -# dnsmasq_install: True -# dns_jail_enabled: False -# Above 7 vars set in /etc/iiab/local_vars.yml -# -# dhcp_service: ???? # Set in individual OS's /opt/iiab/iiab/vars/.yml for use in roles/network/tasks/dhcpd.yml -# dhcp_service2: "dhcpd disabled" # Moved to roles/network/tasks/computed_services.yml as community transitions from named/BIND to dnsmasq (PR #1202) - # Originally for @tim-moody's Nodogsplash approach to Captive Portal # Highly experimental as of June 2018: https://github.com/iiab/iiab/issues/608 #