From 246515ed21d5207f10355ec38cf87991b96677ce Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 4 Apr 2018 02:36:26 -0400 Subject: [PATCH 1/7] Update iiab-hotspot-on --- roles/network/templates/network/iiab-hotspot-on | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/network/templates/network/iiab-hotspot-on b/roles/network/templates/network/iiab-hotspot-on index 9c17a4828..9723a04f1 100755 --- a/roles/network/templates/network/iiab-hotspot-on +++ b/roles/network/templates/network/iiab-hotspot-on @@ -18,3 +18,5 @@ if grep -qi raspbian /etc/*release; then fi sed -i -e "s/^hostapd_enabled.*/hostapd_enabled = True/" /etc/iiab/iiab.ini + +echo -e "\nPlease consider rebooting now.\n" From 1396704aff01d0a69742fd5c40bb05d42f115914 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 4 Apr 2018 03:15:19 -0400 Subject: [PATCH 2/7] record HOSTAPD_ENABLED= into iiab.env --- roles/network/tasks/main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 1735dcc91..006d70a79 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -19,6 +19,16 @@ # be encapsulated into roles/network/tasks/hostapd.yml in future? Whereas # today "./runtags hostapd" doesn't exist & "./runtags AP" is UNSUPPORTED! +- name: Record HOSTAPD_ENABLED to /etc/iiab/iiab.env + lineinfile: + dest: /etc/iiab/iiab.env + regexp: '^HOSTAPD_ENABLED=*' + line: 'HOSTAPD_ENABLED="{{ hostapd_enabled }}"' + state: present + #when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml + tags: + - network + #- name: RPi - reboot to AP post install - installed via wifi so the services are ready # set_fact: # iiab_lan_iface: br0 From 5b671e2a462164c2c83a05308b556f4a41034c73 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 4 Apr 2018 03:27:00 -0400 Subject: [PATCH 3/7] check value/existence of HOSTAPD_ENABLED in iiab.env --- roles/2-common/templates/iiab-startup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/2-common/templates/iiab-startup.sh b/roles/2-common/templates/iiab-startup.sh index cd540334b..b2bfeb397 100644 --- a/roles/2-common/templates/iiab-startup.sh +++ b/roles/2-common/templates/iiab-startup.sh @@ -15,9 +15,9 @@ fi if [[ $(grep -i raspbian /etc/*release) && #($(grep "hostapd_enabled = False" /etc/iiab/config_vars.yml) || #((! $(grep "hostapd_enabled = True" /etc/iiab/config_vars.yml)) && - ! $(grep "^hostapd_enabled = True" /etc/iiab/iiab.ini) ]]; + ! $(grep "^HOSTAPD_ENABLED=True" /etc/iiab/iiab.env) ]]; # NEGATED LOGIC HELPS FORCE PROMISCUOUS MODE EARLY IN INSTALL - # (when computed_network.yml has not yet populated iiab.ini) + # (when network/tasks/main.yml hasn't yet populated iiab.env) # RESULT: WiFi-installed IIAB should have wlan0 properly in # promiscuous mode Even On Reboots (if 2-common completed!) From fa47bc1d416de088ebc415d199c3b89895143f38 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 4 Apr 2018 03:27:25 -0400 Subject: [PATCH 4/7] record HOSTAPD_ENABLED=False into iiab.env --- roles/network/templates/network/iiab-hotspot-off | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/templates/network/iiab-hotspot-off b/roles/network/templates/network/iiab-hotspot-off index ebd04eeb2..31b1d5ffc 100755 --- a/roles/network/templates/network/iiab-hotspot-off +++ b/roles/network/templates/network/iiab-hotspot-off @@ -16,4 +16,4 @@ if grep -qi raspbian /etc/*release; then ip link set dev wlan0 promisc on fi -sed -i -e "s/^hostapd_enabled.*/hostapd_enabled = False/" /etc/iiab/iiab.ini +sed -i -e "s/^HOSTAPD_ENABLED.*/HOSTAPD_ENABLED=False/" /etc/iiab/iiab.env From 2c58341de589c1a07bb08773f595a5641de7e93c Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 4 Apr 2018 03:27:41 -0400 Subject: [PATCH 5/7] record HOSTAPD_ENABLED=True into iiab.env --- roles/network/templates/network/iiab-hotspot-on | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/templates/network/iiab-hotspot-on b/roles/network/templates/network/iiab-hotspot-on index 9723a04f1..bb264ca92 100755 --- a/roles/network/templates/network/iiab-hotspot-on +++ b/roles/network/templates/network/iiab-hotspot-on @@ -17,6 +17,6 @@ if grep -qi raspbian /etc/*release; then ip link set dev wlan0 promisc off fi -sed -i -e "s/^hostapd_enabled.*/hostapd_enabled = True/" /etc/iiab/iiab.ini +sed -i -e "s/^HOSTAPD_ENABLED.*/HOSTAPD_ENABLED=True/" /etc/iiab/iiab.env echo -e "\nPlease consider rebooting now.\n" From aec942f75a3bdb7d1ce8ab63e545bd568e09f671 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 4 Apr 2018 03:57:33 -0400 Subject: [PATCH 6/7] Update main.yml --- roles/network/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 006d70a79..76f54e460 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -23,7 +23,7 @@ lineinfile: dest: /etc/iiab/iiab.env regexp: '^HOSTAPD_ENABLED=*' - line: 'HOSTAPD_ENABLED="{{ hostapd_enabled }}"' + line: 'HOSTAPD_ENABLED={{ hostapd_enabled }}' state: present #when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml tags: From 464488da6248a8dc1444e23f1ad1ab723bbf7f45 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 4 Apr 2018 04:16:51 -0400 Subject: [PATCH 7/7] Update main.yml --- roles/network/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 76f54e460..7300081d4 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -11,8 +11,8 @@ no_net_restart: True # used below in (1) sysd-netd-debian.yml, # (2) debian.yml, (3) rpi_debian.yml when: discovered_wireless_iface == iiab_wan_iface and not reboot_to_AP -# EITHER WAY: hostapd_enabled's state is RECORDED into /etc/iiab/iiab.ini -# (by computed_ntetwork.yml below) for later use by... +# EITHER WAY: hostapd_enabled's state is RECORDED into /etc/iiab/iiab.env +# (happens just below) for later use by... # /usr/libexec/iiab-startup.sh, iiab-hotspot-off & iiab-hotspot-on # # Separate Idea, Not Without Risks: should WiFi-as-gateway detection logic