From 901fb3440b8caa1e68102d7066669ef07c8897ce Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 14 Sep 2022 22:54:31 +0200
Subject: prepare accesspoints and some other stuff for openwrt 22.03

---
 inventory/group_vars/accesspoints/vars.yml | 13 ++++++++++---
 inventory/host_vars/ch-installsmb.yml      |  1 +
 inventory/host_vars/ch-testvm-openwrt.yml  |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'inventory')

diff --git a/inventory/group_vars/accesspoints/vars.yml b/inventory/group_vars/accesspoints/vars.yml
index 18807870..7abe0582 100644
--- a/inventory/group_vars/accesspoints/vars.yml
+++ b/inventory/group_vars/accesspoints/vars.yml
@@ -10,7 +10,7 @@ accesspoint_wifi_device_htmode:
   5g: "VHT80"
 
 accesspoint_wireless_device_paths:
-  2g: "platform/qca956x_wmac"
+  2g: "platform/ahb/18100000.wmac"
   5g: "pci0000:00/0000:00:00.0"
 
 
@@ -118,9 +118,12 @@ openwrt_packages_remove:
   - ppp-mod-pppoe
   - dnsmasq
   - firewall
+  - firewall4
   - odhcpd
   - odhcpd-ipv6only
+  - wpad-basic-wolfssl
 openwrt_packages_add:
+  - hostapd-wolfssl
   - haveged
   - htop
   - ip
@@ -227,7 +230,7 @@ openwrt_mixin:
               local labels = {
                 channel = iw.channel(ifname),
                 ssid = iw.ssid(ifname),
-                bssid = iw.bssid(ifname),
+                bssid = string.lower(iw.bssid(ifname)),
                 mode = iw.mode(ifname),
                 ifname = ifname,
                 country = iw.country(ifname),
@@ -316,11 +319,15 @@ openwrt_uci:
         RootPasswordAuth: 'off'
         Port: '{{ ansible_port }}'
 
+  uhttpd:
+    - name: uhttpd main
+      options:
+        enabled: '0'
+
   prometheus-node-exporter-lua:
     - name: prometheus-node-exporter-lua 'main'
       options:
         listen_interface: 'mgmt'
-        listen_ipv6: '0'
         listen_port: '9100'
 
   network: "{{ accesspoint_network_base + accesspoint_network_zones }}"
diff --git a/inventory/host_vars/ch-installsmb.yml b/inventory/host_vars/ch-installsmb.yml
index bfe4de96..1587c6bf 100644
--- a/inventory/host_vars/ch-installsmb.yml
+++ b/inventory/host_vars/ch-installsmb.yml
@@ -25,6 +25,7 @@ openwrt_packages_remove:
   - ppp-mod-pppoe
   - dnsmasq
   - firewall
+  - firewall4
   - odhcpd
   - odhcpd-ipv6only
 openwrt_packages_add:
diff --git a/inventory/host_vars/ch-testvm-openwrt.yml b/inventory/host_vars/ch-testvm-openwrt.yml
index 9c9b1bf7..4e978fcf 100644
--- a/inventory/host_vars/ch-testvm-openwrt.yml
+++ b/inventory/host_vars/ch-testvm-openwrt.yml
@@ -25,6 +25,7 @@ openwrt_packages_remove:
   - ppp-mod-pppoe
   - dnsmasq
   - firewall
+  - firewall4
   - odhcpd
   - odhcpd-ipv6only
 openwrt_packages_add:
-- 
cgit v1.2.3