freifunk-berlin · pktpls · Jul 26, 2024 · Jul 23, 2024 · Jul 23, 2024 · Jul 23, 2024
diff --git a/group_vars/model_mikrotik_routerboard_760igs.yml b/group_vars/model_mikrotik_routerboard_760igs.yml
@@ -1,6 +1,5 @@
 ---
 target: ramips/mt7621
-openwrt_version: 22.03-SNAPSHOT
 brand_nice: MikroTik
 model_nice: hEX S
 

diff --git a/group_vars/model_ubnt_nanostation_ac_loco.yml b/group_vars/model_ubnt_nanostation_ac_loco.yml
@@ -1,6 +1,5 @@
 ---
 target: ath79/generic
-openwrt_version: 22.03-SNAPSHOT
 brand_nice: Ubiquiti
 model_nice: Nanostation AC Loco
 

diff --git a/group_vars/model_ubnt_nanostation_loco_m5_xm.yml b/group_vars/model_ubnt_nanostation_loco_m5_xm.yml
@@ -1,7 +1,6 @@
 ---
 override_target: "ubnt_nanostation-loco-m"
 target: ath79/tiny
-openwrt_version: 22.03-SNAPSHOT
 brand_nice: Ubiquiti
 model_nice: Nanostation Loco M5
 version_nice: XM

diff --git a/group_vars/model_ubnt_nanostation_m2_xm.yml b/group_vars/model_ubnt_nanostation_m2_xm.yml
@@ -1,7 +1,6 @@
 ---
 override_target: "ubnt_nanostation-m"
 target: ath79/tiny
-openwrt_version: 22.03-SNAPSHOT
 brand_nice: Ubiquiti
 model_nice: Nanostation M2
 version_nice: XM

diff --git a/group_vars/model_ubnt_nanostation_m5_xm.yml b/group_vars/model_ubnt_nanostation_m5_xm.yml
@@ -1,7 +1,6 @@
 ---
 override_target: "ubnt_nanostation-m"
 target: ath79/tiny
-openwrt_version: 22.03-SNAPSHOT
 brand_nice: Ubiquiti
 model_nice: Nanostation M5
 version_nice: XM

diff --git a/group_vars/model_ubnt_unifi_6_lite.yml b/group_vars/model_ubnt_unifi_6_lite.yml
@@ -1,6 +1,5 @@
 ---
 target: ramips/mt7621
-openwrt_version: 22.03-SNAPSHOT
 brand_nice: Ubiquiti
 model_nice: UniFi 6 Lite
 

diff --git a/group_vars/model_ubnt_unifiac_lite.yml b/group_vars/model_ubnt_unifiac_lite.yml
@@ -1,6 +1,5 @@
 ---
 target: ath79/generic
-openwrt_version: 22.03-SNAPSHOT
 brand_nice: Ubiquiti
 model_nice: UniFi AC Lite
 

diff --git a/group_vars/model_ubnt_unifiac_pro.yml b/group_vars/model_ubnt_unifiac_pro.yml
@@ -1,6 +1,5 @@
 ---
 target: ath79/generic
-openwrt_version: 22.03-SNAPSHOT
 brand_nice: Ubiquiti
 model_nice: UniFi AC Mesh Pro
 

diff --git a/group_vars/version_22_03_snapshot.yml b/group_vars/version_22_03_snapshot.yml
diff --git a/locations/dragonkiez-adlerhalle.yml b/locations/dragonkiez-adlerhalle.yml
@@ -8,6 +8,8 @@ height: 2
 community: true
 
 hosts:
+  # TODO: upgrade this host to OpenWrt 23.05, special flash procedure required
+  #       see bbb-configs commit ac0e8e53550fba52136eff27ea0b273e9d3eea8f
   - hostname: dragonkiez-adlerhalle
     role: corerouter
     model: "ubnt_unifiac-mesh"

diff --git a/locations/hds.yml b/locations/hds.yml
@@ -23,7 +23,6 @@ hosts:
   - hostname: hds-ffraum
     role: corerouter
     model: "ubnt_unifiac-pro"
-    openwrt_version: 23.05-SNAPSHOT
     wireless_profile: freifunk_default
 
 snmp_devices:

diff --git a/locations/zwingli.yml b/locations/zwingli.yml
@@ -26,7 +26,6 @@ hosts:
     role: ap
     model: ubnt_unifiac-lite
     wifi_roaming: true
-    openwrt_version: 23.05-SNAPSHOT
 
   - hostname: zwingli-nno-nf-5ghz
     role: ap

diff --git a/roles/cfg_openwrt/templates/corerouter/config/firewall.j2 b/roles/cfg_openwrt/templates/corerouter/config/firewall.j2
@@ -12,9 +12,6 @@ config defaults
 	option forward 'REJECT'
 	option drop_invalid '0'
 
-config include
-	option path '/etc/firewall.user'
-
 config zone 'zone_freifunk'
 	option name 'freifunk'
 	{% for name in zone_freifunk_networks %}

diff --git a/roles/cfg_openwrt/templates/corerouter/firewall.user.j2 b/roles/cfg_openwrt/templates/corerouter/firewall.user.j2