gw-core01: persist dhcp leases

/etc/dhcp.leases is not saved with `sysupgrade -b`

playbook_create_ssh_config.yml

@@ -11,9 +11,9 @@
           Host {{ host }}
             User root
             Hostname {{ hostvars[host]["ip"] }}
-            {% if jumphost is defined and jumphost != host %}
+          {% if jumphost is defined and jumphost != host %}
             ProxyJump {{ jumphost }}
-            {% endif %}
+          {% endif %}
 
           {% endfor %}
         dest: ~/.ssh/ffl_eae_adp_config

playbook_provision_accesspoints.yml

@@ -15,22 +15,6 @@
       notify:
         - "reload {{ item | basename }}"
 
-    # current os ships with that package and leaks mac addresses into prometheus
-    # therefore we nuke it
-    - name: remove prometheus-node-exporter-lua-hostapd_stations
-      opkg:
-        name: prometheus-node-exporter-lua-hostapd_stations
-        state: absent
-      notify:
-        - restart prometheus-node-exporter-lua
-
-    - name: uninstall vanilla prometheus-node-exporter-lua-wifi
-      opkg:
-        name: prometheus-node-exporter-lua-wifi
-        state: absent
-      notify:
-        - restart prometheus-node-exporter-lua
-
     - name: install custom prometheus-node-exporter-lua-wifi
       copy:
         src: files/wifi.lua
@@ -41,10 +25,6 @@
       notify:
         - restart prometheus-node-exporter-lua
 
-    - name: install iwinfo
-      opkg:
-        name: iwinfo
-
   handlers:
     - name: reload network
       service:

templates/gateways/etc/config/dhcp

@@ -12,7 +12,7 @@ config dnsmasq
 	option nonegcache '0'
 	option authoritative '1'
 	option readethers '1'
-	option leasefile '/tmp/dhcp.leases'
+	option leasefile '/etc/dhcp.leases'
 	option resolvfile '/tmp/resolv.conf.d/resolv.conf.auto'
 	option nonwildcard '1'
 	option localservice '1'

templates/gateways/etc/config/network

@@ -12,11 +12,15 @@ config globals 'globals'
 config device 'switch'
         option name 'switch'
         option type 'bridge'
+        option vlan_filtering 1
         list ports 'eth0'
         list ports 'eth1'
         list ports 'eth2'
         list ports 'eth3'
         list ports 'eth4'
+        list ports 'eth5'
+        list ports 'eth6'
+        list ports 'eth7'
 
 config bridge-vlan 'mgmt_vlan'
         option vlan '1'
@@ -24,6 +28,9 @@ config bridge-vlan 'mgmt_vlan'
         list ports 'eth2:u*'
         list ports 'eth3:u*'
         list ports 'eth4:u*'
+        list ports 'eth5:u*'
+        list ports 'eth6:u*'
+        list ports 'eth7:u*'
 
 config bridge-vlan 'clients_vlan'
         option vlan '2'
@@ -31,6 +38,9 @@ config bridge-vlan 'clients_vlan'
         list ports 'eth2:t'
         list ports 'eth3:t'
         list ports 'eth4:t'
+        list ports 'eth5:t'
+        list ports 'eth6:t'
+        list ports 'eth7:t'
 
 config bridge-vlan 'wan_vlan'
         option vlan '3'
@@ -45,6 +55,9 @@ config bridge-vlan 'backoffice_vlan'
         list ports 'eth2:t'
         list ports 'eth3:t'
         list ports 'eth4:t'
+        list ports 'eth5:t'
+        list ports 'eth6:t'
+        list ports 'eth7:t'
 
 config interface 'mgmt'
         option device 'switch.1'

templates/gateways/etc/config/system

@@ -14,9 +14,3 @@ config timeserver 'ntp'
 	list server '1.openwrt.pool.ntp.org'
 	list server '2.openwrt.pool.ntp.org'
 	list server '3.openwrt.pool.ntp.org'
-
-config gpio_switch 'poe_passthrough'
-	option name 'PoE Passthrough'
-	option gpio_pin '480'
-	option value '0'
-