From 6269aa590d6347cae393896e27daec6e52ad0ba5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 17:20:00 -0400 Subject: [PATCH] Update main.yml --- roles/network/defaults/main.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml index 533295a87..7b639a972 100644 --- a/roles/network/defaults/main.yml +++ b/roles/network/defaults/main.yml @@ -62,17 +62,14 @@ network_config_dir: /etc/network/interfaces.d dns_jail_enabled: False services_externally_visible: False -# Following variables set for old Apache, dhcpd, named usage +# DNS / name resolution dhcpd_install: True dhcpd_enabled: True +dhcp_service2: disabled # Proposed by @jvonau to solve #1184 -> PR #1185 as required by roles/network/tasks/computed_services.yml ? named_install: True named_enabled: False dnsmasq_enabled: True dnsmasq_install: True -dhcp_service2: disabled # Proposed by @jvonau to solve #1184 -> PR #1185 as required by roles/network/tasks/computed_services.yml ? - -# For @tim-moody's Nodogsplash approach to Captive Portal? High experimental as of June 2018: github.com/iiab/iiab/issues/608 -captive_portal_enabled: False # Python-based Captive Portal, that @m-anish & @jvonau experimented with in # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt @@ -83,3 +80,8 @@ py_captive_portal_port: "9090" py_captive_portal_username: "Admin" py_captive_portal_password: "changeme" # In a pinch, disable it by running: systemctl disable py-captive-portal + +# For @tim-moody's Nodogsplash approach to Captive Portal? +# Highly experimental as of June 2018: https://github.com/iiab/iiab/issues/608 +# captive_portal_install: False +# captive_portal_enabled: False