external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #69 from iiab/master

Browse source 
sync from iiab/iiab
This commit is contained in:
A Holt 2018-04-05 02:23:36 -04:00 • committed by GitHub
commit 40c3df1b1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/2-common/templates/iiab-startup.sh
View file

@ -15,9 +15,9 @@ fi
if [[ $(grep -i raspbian /etc/*release) && if [[ $(grep -i raspbian /etc/*release) &&
#($(grep "hostapd_enabled = False" /etc/iiab/config_vars.yml) || #($(grep "hostapd_enabled = False" /etc/iiab/config_vars.yml) ||
#((! $(grep "hostapd_enabled = True" /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 # 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 # RESULT: WiFi-installed IIAB should have wlan0 properly in
# promiscuous mode Even On Reboots (if 2-common completed!) # promiscuous mode Even On Reboots (if 2-common completed!)

14
roles/network/tasks/main.yml
View file

@ -11,14 +11,24 @@
no_net_restart: True # used below in (1) sysd-netd-debian.yml, no_net_restart: True # used below in (1) sysd-netd-debian.yml,
# (2) debian.yml, (3) rpi_debian.yml # (2) debian.yml, (3) rpi_debian.yml
when: discovered_wireless_iface == iiab_wan_iface and not reboot_to_AP 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 # EITHER WAY: hostapd_enabled's state is RECORDED into /etc/iiab/iiab.env
# (by computed_ntetwork.yml below) for later use by... # (happens just below) for later use by...
# /usr/libexec/iiab-startup.sh, iiab-hotspot-off & iiab-hotspot-on # /usr/libexec/iiab-startup.sh, iiab-hotspot-off & iiab-hotspot-on
# #
# Separate Idea, Not Without Risks: should WiFi-as-gateway detection logic # Separate Idea, Not Without Risks: should WiFi-as-gateway detection logic
# be encapsulated into roles/network/tasks/hostapd.yml in future? Whereas # be encapsulated into roles/network/tasks/hostapd.yml in future? Whereas
# today "./runtags hostapd" doesn't exist & "./runtags AP" is UNSUPPORTED! # 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 #- name: RPi - reboot to AP post install - installed via wifi so the services are ready
# set_fact: # set_fact:
# iiab_lan_iface: br0 # iiab_lan_iface: br0

2
roles/network/templates/network/iiab-hotspot-off
View file

@ -16,4 +16,4 @@ if grep -qi raspbian /etc/*release; then
ip link set dev wlan0 promisc on ip link set dev wlan0 promisc on
fi 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

4
roles/network/templates/network/iiab-hotspot-on
View file

@ -17,4 +17,6 @@ if grep -qi raspbian /etc/*release; then
ip link set dev wlan0 promisc off ip link set dev wlan0 promisc off
fi 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"