diff options
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/group_vars/accesspoints/vars.yml | 35 | ||||
| -rw-r--r-- | inventory/group_vars/chaos-at-home-ap/vars.yml | 1 | ||||
| -rw-r--r-- | inventory/group_vars/chaos-at-home/network.yml | 4 |
3 files changed, 28 insertions, 12 deletions
diff --git a/inventory/group_vars/accesspoints/vars.yml b/inventory/group_vars/accesspoints/vars.yml index 704dcbf3..ee07c292 100644 --- a/inventory/group_vars/accesspoints/vars.yml +++ b/inventory/group_vars/accesspoints/vars.yml @@ -55,10 +55,10 @@ accesspoint_wireless_ifaces: {} openwrt_variant: openwrt -openwrt_release: 19.07.1 -openwrt_arch: ar71xx +openwrt_release: 19.07.4 +openwrt_arch: ath79 openwrt_target: generic -openwrt_profile: ubnt-unifiac-lite +openwrt_profile: ubnt_unifiac-lite openwrt_output_image_suffixes: - "{{ openwrt_target }}-{{ openwrt_profile }}-squashfs-sysupgrade.bin" @@ -69,7 +69,9 @@ openwrt_packages_remove: - firewall - odhcpd - odhcpd-ipv6only + - wpad-basic openwrt_packages_add: + - hostapd-openssl - haveged - htop - ip @@ -133,14 +135,15 @@ openwrt_mixin: content: | #!/bin/sh - interfaces=$(iw dev | grep "Interface " | awk '{ print($2) }' | sort) + interfaces=$(iw dev | grep "Interface " | cut -d ' ' -f2 | sort) for interface in $interfaces; do - essid=$(iw $interface info | grep "ssid " | awk '{ print($2) }') - bssid=$(iw $interface info | grep "addr " | awk '{ print($2) }') - echo "$interface ($bssid, ssid: $essid)" - iw $interface station dump | grep "^Station" | awk '{ print(" - "$2) }'; - echo ""; + bssid=$(iw $interface info | grep "addr " | cut -d ' ' -f2) + essid=$(iw $interface info | grep "ssid " | cut -d ' ' -f2-) + channel=$(iw $interface info | grep "channel " | cut -d ' ' -f2-) + echo "$interface ($bssid, ssid: '$essid', channel: $channel)" + iw $interface station dump | grep "^Station" | awk '{ print(" - "$2) }' + echo "" done exit 0 @@ -166,6 +169,20 @@ openwrt_uci: - '2.lede.pool.ntp.org' - '3.lede.pool.ntp.org' + - name: led + options: + name: blue + sysfs: ubnt:blue:dome + trigger: none + default: 0 + + - name: led + options: + name: white + sysfs: ubnt:white:dome + trigger: none + default: 0 + dropbear: - name: dropbear options: diff --git a/inventory/group_vars/chaos-at-home-ap/vars.yml b/inventory/group_vars/chaos-at-home-ap/vars.yml index eb05dfad..fcd13ab6 100644 --- a/inventory/group_vars/chaos-at-home-ap/vars.yml +++ b/inventory/group_vars/chaos-at-home-ap/vars.yml @@ -45,4 +45,3 @@ accesspoint_wireless_ifaces_yaml: | key: '{{ accesspoint_zones[zone].key }}' {% endfor %} {% endfor %} - diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index ba06f20c..4fb10e61 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -25,7 +25,7 @@ network_zones: ch-prometheus-legacy: 250 wifi: ssid: "chaos at home" - encryption: "psk2" + encryption: "sae-mixed" key: "{{ vault_wifi_keys.lan }}" iot: @@ -36,7 +36,7 @@ network_zones: limit: 199 wifi: ssid: "stuff at home" - encryption: "psk2" + encryption: "sae-mixed" key: "{{ vault_wifi_keys.iot }}" svc: |