freifunk-berlin · Noki · Jul 15, 2024 · Jul 15, 2024 · Jul 15, 2024 · Jul 15, 2024
diff --git a/group_vars/all/imageprofile.yml b/group_vars/all/imageprofile.yml
@@ -36,6 +36,15 @@ ssl__packages__to_merge:
   - px5g-wolfssl
 
 all_luci_base__packages__to_merge:
+  - luci-app-babeld
+  - luci-app-olsr
+  - luci-app-olsr-services
+  - luci-mod-falter
+  - falter-common
+  - luci-app-falter-owm
+  - luci-app-falter-owm-ant
+  - luci-app-falter-owm-cmd
+  - luci-app-falter-owm-gui
   - libiwinfo-lua
   - luci-mod-admin-full
   - luci-proto-ipv6

diff --git a/group_vars/model_avm_fritzbox_7320.yml b/group_vars/model_avm_fritzbox_7320.yml
@@ -0,0 +1,16 @@
+---
+override_target: "avm_fritz7320"
+target: lantiq/xway
+brand_nice: AVM
+model_nice: FRITZ!Box 7320
+
+int_port: eth0
+low_mem: true
+low_flash: true
+
+wireless_devices:
+  - name: 11g_standard
+    band: 2g
+    htmode_prefix: HT
+    path: pci0000:00/0000:00:0e.0
+    ifname_hint: wlan2
diff --git a/group_vars/model_avm_fritzrepeater_1200.yml b/group_vars/model_avm_fritzrepeater_1200.yml
@@ -0,0 +1,18 @@
+---
+target: ipq40xx/generic
+brand_nice: AVM
+model_nice: FRITZ!Repeater 1200
+
+int_port: eth0
+
+wireless_devices:
+  - name: 11a_standard
+    band: 5g
+    htmode_prefix: VHT
+    path: platform/soc/a800000.wifi
+    ifname_hint: wlan5
+  - name: 11g_standard
+    band: 2g
+    htmode_prefix: HT
+    path: platform/soc/a000000.wifi
+    ifname_hint: wlan2
diff --git a/group_vars/model_comfast_cf_e130n_v2.yml b/group_vars/model_comfast_cf_e130n_v2.yml
@@ -0,0 +1,17 @@
+---
+target: ath79/generic
+brand_nice: COMFAST
+model_nice: CF-E130N
+version_nice: v2
+
+int_port: eth0
+
+low_mem: true
+low_flash: true
+
+wireless_devices:
+  - name: 11g_standard
+    band: 2g
+    htmode_prefix: HT
+    path: platform/ahb/18100000.wmac
+    ifname_hint: wlan2
diff --git a/group_vars/model_comfast_cf_ew72.yml b/group_vars/model_comfast_cf_ew72.yml
@@ -0,0 +1,19 @@
+---
+target: ath79/generic
+brand_nice: COMFAST
+model_nice: CF-EW72
+version_nice: v1
+
+int_port: eth0
+
+wireless_devices:
+  - name: 11a_standard
+    band: 5g
+    htmode_prefix: HT
+    path: pci0000:00/0000:00:00.0
+    ifname_hint: wlan5
+  - name: 11g_standard
+    band: 2g
+    htmode_prefix: HT
+    path: platform/ahb/18100000.wmac
+    ifname_hint: wlan2
diff --git a/group_vars/model_dlink_dap_x1860_a1.yml b/group_vars/model_dlink_dap_x1860_a1.yml
@@ -3,6 +3,7 @@ target: ramips/mt7621
 brand_nice: D-Link
 model_nice: DAP-X1860
 version_nice: A1
+openwrt_version: snapshot
 
 int_port: lan
 

diff --git a/group_vars/model_glinet_gl_ar300m_nor.yml b/group_vars/model_glinet_gl_ar300m_nor.yml
@@ -0,0 +1,13 @@
+---
+target: ath79/nand
+brand_nice: GL.iNet
+model_nice: GL-AR300M NOR
+
+int_port: eth0
+
+wireless_devices:
+  - name: 11g_standard
+    band: 2g
+    htmode_prefix: HT
+    path: platform/ahb/18100000.wmac
+    ifname_hint: wlan2
diff --git a/group_vars/model_speedport_w_504v_typ_a.yml b/group_vars/model_speedport_w_504v_typ_a.yml
@@ -0,0 +1,22 @@
+---
+override_target: "arcadyan_arv8539pw22"
+target: lantiq/xway
+brand_nice: Speedport
+model_nice: W 504V Typ A
+openwrt_version: 22.03-SNAPSHOT
+
+switch_ports: 6
+switch_int_port: 0
+switch_ignore_ports: [1]
+
+int_port: eth0
+
+low_mem: true
+low_flash: true
+
+wireless_devices:
+  - name: 11g_standard
+    band: 2g
+    htmode_prefix: HT
+    path: pci0000:00/0000:00:0e.0
+    ifname_hint: wlan2
diff --git a/group_vars/model_tplink_cpe210_v1.yml b/group_vars/model_tplink_cpe210_v1.yml
@@ -3,11 +3,15 @@ target: ath79/generic
 brand_nice: TP-Link
 model_nice: CPE210
 version_nice: v1
+openwrt_version: snapshot
 
 # PoE port is eth1, 2nd port is eth0
 # override port in host_vars if required
 int_port: eth1
 
+low_mem: true
+low_flash: true
+
 wireless_devices:
   - name: 11g_standard
     band: 2g

diff --git a/group_vars/model_tplink_eap225_outdoor_v3.yml b/group_vars/model_tplink_eap225_outdoor_v3.yml
@@ -0,0 +1,19 @@
+---
+target: ath79/generic
+brand_nice: TP-Link
+model_nice: EAP225
+version_nice: v3
+
+int_port: eth0
+
+wireless_devices:
+  - name: 11a_standard
+    band: 5g
+    htmode_prefix: VHT
+    path: pci0000:00/0000:00:00.0
+    ifname_hint: wlan5
+  - name: 11g_standard
+    band: 2g
+    htmode_prefix: HT
+    path: platform/ahb/18100000.wmac
+    ifname_hint: wlan2
diff --git a/group_vars/model_tplink_tl_mr3020_v3.yml b/group_vars/model_tplink_tl_mr3020_v3.yml
@@ -0,0 +1,18 @@
+---
+target: ramips/mt76x8
+brand_nice: TP-Link
+model_nice: TL-MR3020
+version_nice: v3
+
+dsa_ports:
+  - lan
+
+low_mem: true
+low_flash: true
+
+wireless_devices:
+  - name: 11g_standard
+    band: 2g
+    htmode_prefix: HT
+    path: platform/10300000.wmac
+    ifname_hint: wlan2
diff --git a/group_vars/model_ubnt_unifiac_mesh.yml b/group_vars/model_ubnt_unifiac_mesh.yml
@@ -3,12 +3,12 @@ target: ath79/generic
 brand_nice: Ubiquiti
 model_nice: UniFi AC Mesh
 
+int_port: eth0
+
 model__packages__to_merge:
   - "-kmod-ath10k-ct -ath10k-firmware-qca988x-ct"
   - "kmod-ath10k ath10k-firmware-qca988x"
 
-int_port: eth0
-
 wireless_devices:
   - name: 11a_standard
     band: 5g
@@ -18,5 +18,5 @@ wireless_devices:
   - name: 11g_standard
     band: 2g
     htmode_prefix: HT
-    path: platform/qca956x_wmac
+    path: platform/ahb/18100000.wmac
     ifname_hint: wlan2
diff --git a/group_vars/role_corerouter/imageprofile.yml b/group_vars/role_corerouter/imageprofile.yml
@@ -1,7 +1,6 @@
 ---
 role_corerouter__packages__to_merge:
   - babeld
-  - luci-app-babeld
   - collectd-mod-dhcpleases
   - collectd-mod-olsrd
   - collectd-mod-conntrack
@@ -13,13 +12,5 @@ role_corerouter__packages__to_merge:
   - olsrd-mod-nameservice
   - olsrd-mod-txtinfo
   - olsrd-utils
-  - luci-app-olsr
-  - luci-app-olsr-services
-  - luci-mod-falter
-  - falter-common
-  - luci-app-falter-owm
-  - luci-app-falter-owm-ant
-  - luci-app-falter-owm-cmd
-  - luci-app-falter-owm-gui
   - iptables-mod-ipopt
   - kmod-ipt-ipopt
diff --git a/locations/hdk-0.yml b/locations/hdk-0.yml
@@ -0,0 +1,76 @@
+---
+location: hdk-0
+location_nice: Heidekampgraben 0
+latitude: 52.478078
+longitude: 13.471925
+community: true
+
+hosts:
+  - hostname: hdk-0
+    role: corerouter
+    model: "avm_fritzbox-7530"
+    wireless_profile: freifunk_default
+
+ipv6_prefix: '2001:bf7:840:2000::/56'
+
+# Router: 10.248.6.0/26 2001:bf7:840:2000::/56
+# --MGMT: 10.248.6.0/28
+# --MESH: 10.248.6.16/28
+# --DHCP: 10.248.6.32/27
+
+# Disable noping
+dhcp_no_ping: false
+
+networks:
+  # DHCP with filtering and isolation
+  - vid: 40
+    role: dhcp
+    untagged: true
+    inbound_filtering: true
+    enforce_client_isolation: true
+    prefix: 10.248.6.32/27
+    ipv6_subprefix: 0
+    assignments:
+      hdk-0: 1
+
+  # MESH - 5 GHz 802.11s
+  - vid: 20
+    role: mesh
+    name: mesh_5g
+    prefix: 10.248.6.16/32
+    ipv6_subprefix: -20
+    mesh_ap: hdk-0
+    mesh_radio: 11a_standard
+    mesh_iface: mesh
+
+  # MESH - 2.4 GHz 802.11s
+  - vid: 21
+    role: mesh
+    name: mesh_2g
+    prefix: 10.248.6.17/32
+    ipv6_subprefix: -21
+    # make mesh_metric(s) for 2GHz worse than 5GHz
+    mesh_metric: 1024
+    mesh_metric_lqm: ['default 0.8']
+    mesh_ap: hdk-0
+    mesh_radio: 11g_standard
+    mesh_iface: mesh
+
+  # MGMT
+  - vid: 42
+    role: mgmt
+    prefix: 10.248.6.0/28
+    gateway: 1
+    dns: 1
+    ipv6_subprefix: 1
+    assignments:
+      # 10.248.6.1/28
+      hdk-0: 1
+
+# AP-id, wifi-channel, bandwidth, txpower
+location__channel_assignments_11a_standard__to_merge:
+  hdk-0: 36-40
+
+# AP-id, wifi-channel, bandwidth, txpower
+location__channel_assignments_11g_standard__to_merge:
+  hdk-0: 13-20
diff --git a/locations/hdk-13.yml b/locations/hdk-13.yml
@@ -0,0 +1,76 @@
+---
+location: hdk-13
+location_nice: Heidekampgraben 13
+latitude: 52.478237
+longitude: 13.472834
+community: true
+
+hosts:
+  - hostname: hdk-13
+    role: corerouter
+    model: "tplink_tl-mr3020-v3"
+    wireless_profile: freifunk_default
+
+ipv6_prefix: '2001:bf7:840:3100::/56'
+
+# Router: 10.248.10.192/26 2001:bf7:840:3100::/56
+# --MGMT: 10.248.10.192/28
+# --MESH: 10.248.10.208/28
+# --DHCP: 10.248.10.224/27
+
+# Disable noping
+dhcp_no_ping: false
+
+networks:
+  # DHCP with filtering and isolation
+  - vid: 40
+    role: dhcp
+    untagged: true
+    inbound_filtering: true
+    enforce_client_isolation: true
+    prefix: 10.248.10.224/27
+    ipv6_subprefix: 0
+    assignments:
+      hdk-13: 1
+
+  # MESH - 5 GHz 802.11s
+  - vid: 20
+    role: mesh
+    name: mesh_5g
+    prefix: 10.248.10.208/32
+    ipv6_subprefix: -20
+    mesh_ap: hdk-13
+    mesh_radio: 11a_standard
+    mesh_iface: mesh
+
+  # MESH - 2.4 GHz 802.11s
+  - vid: 21
+    role: mesh
+    name: mesh_2g
+    prefix: 10.248.10.209/32
+    ipv6_subprefix: -21
+    # make mesh_metric(s) for 2GHz worse than 5GHz
+    mesh_metric: 1024
+    mesh_metric_lqm: ['default 0.8']
+    mesh_ap: hdk-13
+    mesh_radio: 11g_standard
+    mesh_iface: mesh
+
+  # MGMT
+  - vid: 42
+    role: mgmt
+    prefix: 10.248.10.192/28
+    gateway: 1
+    dns: 1
+    ipv6_subprefix: 1
+    assignments:
+      # 10.248.10.193/28
+      hdk-13: 1
+
+# AP-id, wifi-channel, bandwidth, txpower
+location__channel_assignments_11a_standard__to_merge:
+  hdk-13: 36-40
+
+# AP-id, wifi-channel, bandwidth, txpower
+location__channel_assignments_11g_standard__to_merge:
+  hdk-13: 13-20