mirror of
https://github.com/iiab/iiab.git
synced 2025-02-12 19:22:24 +00:00
A Holt
GitHub
commit
d9f48fa71d
9 changed files with 26 additions and 30 deletions
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
# Info needed to install Gitea:
|
||||
|
||||
gitea_version: 1.11.4
|
||||
gitea_version: 1.11.5
|
||||
iset_suffixes:
|
||||
i386: 386
|
||||
x86_64: amd64
|
||||
|
|
|
|||
|
|
@ -1,17 +1,14 @@
|
|||
- name: detected_network
|
||||
include_tasks: detected_network.yml
|
||||
|
||||
- name: IF WIFI IS PRIMARY GATEWAY, PLEASE RUN 'iiab-hotspot-on' MANUALLY
|
||||
- name: "Set 'no_net_restart: True' if discovered_wireless_iface == iiab_wan_iface"
|
||||
set_fact:
|
||||
no_net_restart: True # used below in (1) sysd-netd-debian.yml,
|
||||
# (2) debian.yml, (3) rpi_debian.yml,
|
||||
# (4) NM-debian.yml
|
||||
no_net_restart: True # 2020-05-09: Var is currently used in 10 files:
|
||||
# 0-init/defaults/main.yml, network/tasks/main.yml, debian.yml,
|
||||
# detected_network.yml, down-debian.yml, NM-debian.yml, restart.yml,
|
||||
# sysd-netd-debian.yml, computed_services.yml, rpi_debian.yml
|
||||
when: discovered_wireless_iface == iiab_wan_iface
|
||||
|
||||
# EITHER WAY: hostapd_enabled's state is RECORDED into {{ iiab_env_file }}
|
||||
# in hostapd.yml for later use by...
|
||||
# /usr/libexec/iiab-startup.sh, iiab-hotspot-off & iiab-hotspot-on
|
||||
#
|
||||
- name: computed_network
|
||||
include_tasks: computed_network.yml
|
||||
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
systemd:
|
||||
name: clone-wifi
|
||||
state: started
|
||||
when: wifi_up_down and discovered_wireless_iface != "none"
|
||||
|
||||
- name: Restart the systemd-networkd service
|
||||
systemd:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
CURR_VER="undefined" # Ansible version you currently have installed
|
||||
GOOD_VER="2.9.7" # For XO laptops (pip install) & CentOS (yum install rpm)
|
||||
GOOD_VER="2.9.6" # For XO laptops (pip install) & CentOS (yum install rpm)
|
||||
# On other OS's we attempt the latest from PPA, which might be more recent
|
||||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
CURR_VER="undefined" # Ansible version you currently have installed
|
||||
GOOD_VER="2.9.7" # For XO laptops (pip install) & CentOS (yum install rpm)
|
||||
GOOD_VER="2.9.6" # For XO laptops (pip install) & CentOS (yum install rpm)
|
||||
# On other OS's we attempt the latest from PPA, which might be more recent
|
||||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
|
|
|||
|
|
@ -93,13 +93,11 @@ host_wifi_mode: g
|
|||
host_channel: 6
|
||||
hostapd_secure: False
|
||||
hostapd_password: changeme
|
||||
hostapd_install: True # 2020-01-21: do not rely on this var for now (might be implemented in future)
|
||||
hostapd_install: True # 2020-01-21: this var MIGHT be implemented in future.
|
||||
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!)
|
||||
wifi_up_down: True # Creates a second virtual wifi adapter for WiFi upstream to internet
|
||||
# as well as classroom hotspot, use iiab_gateway_enabled for pass through
|
||||
wifi_up_down: True # Creates a 2nd virtual wifi adapter for upstream WiFi
|
||||
# (e.g. to Internet) in addition to downstream WiFi (e.g. classroom hotspot).
|
||||
# You can set iiab_gateway_enabled below, to enable "passthrough" to Internet.
|
||||
|
||||
# Gateway mode
|
||||
iiab_lan_enabled: True
|
||||
|
|
@ -125,10 +123,7 @@ ports_externally_visible: 3 # ssh + http-or-https + common IIAB services
|
|||
# /opt/iiab/iiab/roles/network/templates/gateway/iiab-gen-iptables
|
||||
# And then run: cd /opt/iiab/iiab; ./iiab-network
|
||||
|
||||
# Gateway and Filters
|
||||
# Most all implementations use "iiab_gateway_enabled: False" within
|
||||
# local_vars.yml as they cannot afford Internet access for students
|
||||
# and teachers, and the many associated IT/support/training costs.
|
||||
# Set True if client machines should have "passthrough" access to WAN/Internet:
|
||||
iiab_gateway_enabled: False
|
||||
gw_squid_whitelist: False
|
||||
gw_block_https: False
|
||||
|
|
|
|||
|
|
@ -46,8 +46,9 @@ host_wifi_mode: g
|
|||
host_channel: 6
|
||||
hostapd_secure: False
|
||||
hostapd_password: changeme
|
||||
wifi_up_down: True # Creates a second virtual wifi adapter for WiFi upstream to internet
|
||||
# as well as classroom hotspot, use iiab_gateway_enabled for pass through
|
||||
wifi_up_down: True # Creates a 2nd virtual wifi adapter for upstream WiFi
|
||||
# (e.g. to Internet) in addition to downstream WiFi (e.g. classroom hotspot).
|
||||
# You can set iiab_gateway_enabled below, to enable "passthrough" to Internet.
|
||||
|
||||
# See "How do I set a static IP address?" for Ethernet, in http://FAQ.IIAB.IO
|
||||
wan_ip: dhcp # wan_ip: 192.168.1.99
|
||||
|
|
@ -71,7 +72,7 @@ ports_externally_visible: 3 # ssh + http-or-https + common IIAB services
|
|||
# /opt/iiab/iiab/roles/network/templates/gateway/iiab-gen-iptables
|
||||
# And then run: cd /opt/iiab/iiab; ./iiab-network
|
||||
|
||||
# Make this True if client machines should have access to WAN/Internet:
|
||||
# Set True if client machines should have "passthrough" access to WAN/Internet:
|
||||
iiab_gateway_enabled: False
|
||||
|
||||
dhcpd_install: False
|
||||
|
|
|
|||
|
|
@ -46,8 +46,9 @@ host_wifi_mode: g
|
|||
host_channel: 6
|
||||
hostapd_secure: False
|
||||
hostapd_password: changeme
|
||||
wifi_up_down: True # Creates a second virtual wifi adapter for WiFi upstream to internet
|
||||
# as well as classroom hotspot, use iiab_gateway_enabled for pass through
|
||||
wifi_up_down: True # Creates a 2nd virtual wifi adapter for upstream WiFi
|
||||
# (e.g. to Internet) in addition to downstream WiFi (e.g. classroom hotspot).
|
||||
# You can set iiab_gateway_enabled below, to enable "passthrough" to Internet.
|
||||
|
||||
# See "How do I set a static IP address?" for Ethernet, in http://FAQ.IIAB.IO
|
||||
wan_ip: dhcp # wan_ip: 192.168.1.99
|
||||
|
|
@ -71,7 +72,7 @@ ports_externally_visible: 3 # ssh + http-or-https + common IIAB services
|
|||
# /opt/iiab/iiab/roles/network/templates/gateway/iiab-gen-iptables
|
||||
# And then run: cd /opt/iiab/iiab; ./iiab-network
|
||||
|
||||
# Make this True if client machines should have access to WAN/Internet:
|
||||
# Set True if client machines should have "passthrough" access to WAN/Internet:
|
||||
iiab_gateway_enabled: False
|
||||
|
||||
dhcpd_install: False
|
||||
|
|
|
|||
|
|
@ -46,8 +46,9 @@ host_wifi_mode: g
|
|||
host_channel: 6
|
||||
hostapd_secure: False
|
||||
hostapd_password: changeme
|
||||
wifi_up_down: True # Creates a second virtual wifi adapter for WiFi upstream to internet
|
||||
# as well as classroom hotspot, use iiab_gateway_enabled for pass through
|
||||
wifi_up_down: True # Creates a 2nd virtual wifi adapter for upstream WiFi
|
||||
# (e.g. to Internet) in addition to downstream WiFi (e.g. classroom hotspot).
|
||||
# You can set iiab_gateway_enabled below, to enable "passthrough" to Internet.
|
||||
|
||||
# See "How do I set a static IP address?" for Ethernet, in http://FAQ.IIAB.IO
|
||||
wan_ip: dhcp # wan_ip: 192.168.1.99
|
||||
|
|
@ -71,7 +72,7 @@ ports_externally_visible: 3 # ssh + http-or-https + common IIAB services
|
|||
# /opt/iiab/iiab/roles/network/templates/gateway/iiab-gen-iptables
|
||||
# And then run: cd /opt/iiab/iiab; ./iiab-network
|
||||
|
||||
# Make this True if client machines should have access to WAN/Internet:
|
||||
# Set True if client machines should have "passthrough" access to WAN/Internet:
|
||||
iiab_gateway_enabled: False
|
||||
|
||||
dhcpd_install: False
|
||||
|
|
|
|||
Loading…
Reference in a new issue