From fcbf8a53dfb176b3be4d6d1bbdb63cb8718f7ad2 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Mon, 15 Jul 2024 09:21:23 +0200 Subject: [PATCH 01/32] model: ubnt unifiac mesh: fix 2.4 ghz path On stock openwrt 23.05 the path is different. --- group_vars/model_ubnt_unifiac_mesh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/model_ubnt_unifiac_mesh.yml b/group_vars/model_ubnt_unifiac_mesh.yml index 4849df4d8..1825b6a2f 100644 --- a/group_vars/model_ubnt_unifiac_mesh.yml +++ b/group_vars/model_ubnt_unifiac_mesh.yml @@ -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 From 10b396f6c124d322d009b04f20458e592fbaef4c Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Mon, 15 Jul 2024 09:23:06 +0200 Subject: [PATCH 02/32] model: fritzrepeater 1200: add model --- group_vars/model_avm_fritzrepeater_1200.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 group_vars/model_avm_fritzrepeater_1200.yml diff --git a/group_vars/model_avm_fritzrepeater_1200.yml b/group_vars/model_avm_fritzrepeater_1200.yml new file mode 100644 index 000000000..4ee30f18d --- /dev/null +++ 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 From 142dd69655cf71dabf91ef2b4af83a314f01beb2 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Mon, 15 Jul 2024 09:27:14 +0200 Subject: [PATCH 03/32] hdk-17: rename parzelle-17 to hdk-17 --- locations/{parzelle17.yml => hdk-17.yml} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename locations/{parzelle17.yml => hdk-17.yml} (87%) diff --git a/locations/parzelle17.yml b/locations/hdk-17.yml similarity index 87% rename from locations/parzelle17.yml rename to locations/hdk-17.yml index c33ae4864..f61cb0f36 100644 --- a/locations/parzelle17.yml +++ b/locations/hdk-17.yml @@ -1,6 +1,6 @@ --- -location: parzelle17 -location_nice: Parzelle 17 +location: hdk-17 +location_nice: Heidekampgraben 17 latitude: 52.478675 longitude: 13.471268 community: true @@ -18,7 +18,7 @@ dns_servers: - 2606:4700:4700::1001 hosts: - - hostname: parzelle17-core + - hostname: hdk-17 role: corerouter model: "dlink_dap-x1860-a1" wireless_profile: freifunk_default @@ -45,7 +45,7 @@ networks: prefix: 10.31.207.32/27 ipv6_subprefix: 0 assignments: - parzelle17-core: 1 + hdk-17: 1 # MESH - 5 GHz 802.11s - vid: 20 @@ -53,7 +53,7 @@ networks: name: mesh_5g prefix: 10.31.207.16/32 ipv6_subprefix: -20 - mesh_ap: parzelle17-core + mesh_ap: hdk-17 mesh_radio: 11a_standard mesh_iface: mesh @@ -63,7 +63,7 @@ networks: name: mesh_2g prefix: 10.31.207.17/32 ipv6_subprefix: -21 - mesh_ap: parzelle17-core + mesh_ap: hdk-17 mesh_radio: 11g_standard mesh_iface: mesh @@ -76,4 +76,4 @@ networks: ipv6_subprefix: 1 assignments: # 10.31.207.1/32 - parzelle17-core: 1 + hdk-17: 1 From 5e5844e3488302bc71ae47c2e0234d5e81971165 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Mon, 15 Jul 2024 09:27:45 +0200 Subject: [PATCH 04/32] hdk-30: add new location --- locations/hdk-30.yml | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 locations/hdk-30.yml diff --git a/locations/hdk-30.yml b/locations/hdk-30.yml new file mode 100644 index 000000000..56bcd373a --- /dev/null +++ b/locations/hdk-30.yml @@ -0,0 +1,91 @@ +--- +location: hdk-30 +location_nice: Heidekampgraben +latitude: 52.478042919 +longitude: 13.471797109 + +# config restored from router configuration +# got following prefixes: +# Router: 10.248.4.192/26 +# --MGMT: 10.248.4.192/28 +# --MESH: 10.248.4.208/28 +# --DHCP: 10.248.4.224/27 + +community: true + +hosts: + - hostname: hdk-30 + role: corerouter + model: "ubnt_unifiac-mesh" + wireless_profile: freifunk_default + +ipv6_prefix: "2001:bf7:840:1b00::/56" + +networks: + # DHCP with filtering and isolation + - vid: 40 + role: dhcp + inbound_filtering: true + enforce_client_isolation: true + prefix: 10.248.4.224/27 + ipv6_subprefix: 0 + assignments: + hdk-30: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5ghz + prefix: 10.248.4.208/32 + ipv6_subprefix: -1 + mesh_ap: hdk-30 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2ghz + prefix: 10.248.4.209/32 + ipv6_subprefix: -2 + # make mesh_metric(s) for 2GHz worse than 5GHz + mesh_metric: 1024 + mesh_metric_lqm: ['default 0.8'] + mesh_ap: hdk-30 + mesh_radio: 11g_standard + mesh_iface: mesh + + - vid: 50 + role: uplink + untagged: true + + - role: tunnel + ifname: ts_wg0 + mtu: 1280 + prefix: 10.248.4.210/32 + wireguard_port: 51820 + + - role: tunnel + ifname: ts_wg1 + mtu: 1280 + prefix: 10.248.4.211/32 + wireguard_port: 51821 + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.4.192/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.4.193/28 + hdk-30: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-30: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-30: 13-20 From b0fdff2504d03e3d26ccac2ed3098a03a5421475 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Mon, 15 Jul 2024 09:27:58 +0200 Subject: [PATCH 05/32] hdk-6: add new location --- locations/hdk-6.yml | 75 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 locations/hdk-6.yml diff --git a/locations/hdk-6.yml b/locations/hdk-6.yml new file mode 100644 index 000000000..94651bf9e --- /dev/null +++ b/locations/hdk-6.yml @@ -0,0 +1,75 @@ +--- +location: hdk-6 +location_nice: Heidekampgraben 6 +latitude: 52.478675 +longitude: 13.471268 +community: true + +hosts: + - hostname: hdk-6 + role: corerouter + model: "avm_fritzrepeater-1200" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:1c00::/56' + +# config restored from router configuration +# got following prefixes: +# Router: 10.248.5.0/26 2001:bf7:840:1c00::/56 +# --MGMT: 10.248.5.0/28 +# --MESH: 10.248.5.16/28 +# --DHCP: 10.248.5.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.5.32/27 + ipv6_subprefix: 0 + assignments: + hdk-6: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.5.16/32 + ipv6_subprefix: -20 + mesh_ap: hdk-6 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.5.17/32 + ipv6_subprefix: -21 + mesh_ap: hdk-6 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.5.0/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.5.1/32 + hdk-6: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-6: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-6: 13-20 From 3d1d95a799192baee4ddb53463d2d3a055418f7d Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Mon, 15 Jul 2024 09:28:10 +0200 Subject: [PATCH 06/32] hdk-15: add new location --- locations/hdk-15.yml | 75 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 locations/hdk-15.yml diff --git a/locations/hdk-15.yml b/locations/hdk-15.yml new file mode 100644 index 000000000..4c26c55e5 --- /dev/null +++ b/locations/hdk-15.yml @@ -0,0 +1,75 @@ +--- +location: hdk-15 +location_nice: Heidekampgraben 15 +latitude: 52.478675 +longitude: 13.471268 +community: true + +hosts: + - hostname: hdk-15 + role: corerouter + model: "avm_fritzbox-7530" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:1d00::/56' + +# config restored from router configuration +# got following prefixes: +# Router: 10.248.5.64/26 2001:bf7:840:1d00::/56 +# --MGMT: 10.248.5.64/28 +# --MESH: 10.248.5.80/28 +# --DHCP: 10.248.5.96/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.5.96/27 + ipv6_subprefix: 0 + assignments: + hdk-15: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.5.80/32 + ipv6_subprefix: -20 + mesh_ap: hdk-15 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.5.81/32 + ipv6_subprefix: -21 + mesh_ap: hdk-15 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.5.64/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.5.1/32 + hdk-15: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-15: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-15: 13-20 From d1742ff36d03e9394cb5263676ecf7ed44c44507 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Mon, 15 Jul 2024 10:09:42 +0200 Subject: [PATCH 07/32] hdk-48: add new location --- locations/hdk-48.yml | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 locations/hdk-48.yml diff --git a/locations/hdk-48.yml b/locations/hdk-48.yml new file mode 100644 index 000000000..f1757f331 --- /dev/null +++ b/locations/hdk-48.yml @@ -0,0 +1,91 @@ +--- +location: hdk-48 +location_nice: Heidekampgraben +latitude: 52.478993688 +longitude: 13.471185565 + +# config restored from router configuration +# got following prefixes: +# Router: 10.248.5.128/26 2001:bf7:840:1e00::/56 +# --MGMT: 10.248.5.128/28 +# --MESH: 10.248.5.144/28 +# --DHCP: 10.248.5.160/27 + +community: true + +hosts: + - hostname: hdk-48 + role: corerouter + model: "siemens_ws-ap3610" + wireless_profile: freifunk_default + +ipv6_prefix: "2001:bf7:840:1e00::/56" + +networks: + # DHCP with filtering and isolation + - vid: 40 + role: dhcp + inbound_filtering: true + enforce_client_isolation: true + prefix: 10.248.5.160/27 + ipv6_subprefix: 0 + assignments: + hdk-48: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5ghz + prefix: 10.248.5.144/32 + ipv6_subprefix: -1 + mesh_ap: hdk-48 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2ghz + prefix: 10.248.5.145/32 + ipv6_subprefix: -2 + # make mesh_metric(s) for 2GHz worse than 5GHz + mesh_metric: 1024 + mesh_metric_lqm: ['default 0.8'] + mesh_ap: hdk-48 + mesh_radio: 11g_standard + mesh_iface: mesh + + - vid: 50 + role: uplink + untagged: true + + - role: tunnel + ifname: ts_wg0 + mtu: 1280 + prefix: 10.248.5.146/32 + wireguard_port: 51820 + + - role: tunnel + ifname: ts_wg1 + mtu: 1280 + prefix: 10.248.5.147/32 + wireguard_port: 51821 + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.5.128/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.5.129/28 + hdk-48: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-48: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-48: 13-20 From fac3665b81a2b0ee630664cb522a50ac7a4b3fd0 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Mon, 15 Jul 2024 10:40:58 +0200 Subject: [PATCH 08/32] model: add tplink eap225 outdoor v3 --- group_vars/model_tplink_eap225_outdoor_v3.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 group_vars/model_tplink_eap225_outdoor_v3.yml diff --git a/group_vars/model_tplink_eap225_outdoor_v3.yml b/group_vars/model_tplink_eap225_outdoor_v3.yml new file mode 100644 index 000000000..9323ca657 --- /dev/null +++ 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 From d65583aed3f82efd87f1f016a6111153c0fddb38 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Mon, 15 Jul 2024 10:41:15 +0200 Subject: [PATCH 09/32] hdk-66b: add new location --- locations/hdk-66b.yml | 75 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 locations/hdk-66b.yml diff --git a/locations/hdk-66b.yml b/locations/hdk-66b.yml new file mode 100644 index 000000000..c485f61e8 --- /dev/null +++ b/locations/hdk-66b.yml @@ -0,0 +1,75 @@ +--- +location: hdk-66b +location_nice: Heidekampgraben 66b +latitude: 52.478131 +longitude: 13.470509 +community: true + +hosts: + - hostname: hdk-66b + role: corerouter + model: "tplink_eap225-outdoor-v3" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:1f00::/56' + +# config restored from router configuration +# got following prefixes: +# Router: 10.248.5.192/26 2001:bf7:840:1f00::/56 +# --MGMT: 10.248.5.192/28 +# --MESH: 10.248.5.208/28 +# --DHCP: 10.248.5.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.5.224/27 + ipv6_subprefix: 0 + assignments: + hdk-66b: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.5.208/32 + ipv6_subprefix: -20 + mesh_ap: hdk-66b + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.5.209/32 + ipv6_subprefix: -21 + mesh_ap: hdk-66b + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.5.192/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.5.193/28 + hdk-66b: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-66b: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-66b: 13-20 From e2bb93d0b34b05152e53d73b96952493c4671a99 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Mon, 15 Jul 2024 10:56:11 +0200 Subject: [PATCH 10/32] hdk-0: add new location --- locations/hdk-0.yml | 73 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 locations/hdk-0.yml diff --git a/locations/hdk-0.yml b/locations/hdk-0.yml new file mode 100644 index 000000000..c91422af3 --- /dev/null +++ b/locations/hdk-0.yml @@ -0,0 +1,73 @@ +--- +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 + 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 From ed963d1690caf2bee51cba6b7010b7867671ce63 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Mon, 15 Jul 2024 11:21:22 +0200 Subject: [PATCH 11/32] hdk54: add new location --- locations/hdk-54.yml | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 locations/hdk-54.yml diff --git a/locations/hdk-54.yml b/locations/hdk-54.yml new file mode 100644 index 000000000..eeca6558b --- /dev/null +++ b/locations/hdk-54.yml @@ -0,0 +1,76 @@ +--- +location: hdk-54 +location_nice: Heidekampgraben 54 +latitude: 52.47832795 +longitude: 13.47192646 +community: true + +hosts: + - hostname: hdk-54 + role: corerouter + model: "avm_fritzbox-7530" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2100::/56' + +# Router: 10.248.6.64/26 2001:bf7:840:2100::/56 +# --MGMT: 10.248.6.64/28 +# --MESH: 10.248.6.80/28 +# --DHCP: 10.248.6.96/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.96/27 + ipv6_subprefix: 0 + assignments: + hdk-54: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.6.80/32 + ipv6_subprefix: -20 + mesh_ap: hdk-54 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.6.81/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-54 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.6.64/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.6.65/28 + hdk-54: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-54: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-54: 13-20 From 13fb4a1cd9e8da38c4fa208fc212d890bf7ad1e2 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Tue, 16 Jul 2024 01:10:31 +0200 Subject: [PATCH 12/32] hdk-42: add new location --- locations/hdk-42.yml | 73 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 locations/hdk-42.yml diff --git a/locations/hdk-42.yml b/locations/hdk-42.yml new file mode 100644 index 000000000..8e07555b0 --- /dev/null +++ b/locations/hdk-42.yml @@ -0,0 +1,73 @@ +--- +location: hdk-42 +location_nice: Heidekampgraben 42 +latitude: 52.478800921 +longitude: 13.471823930 +community: true + +hosts: + - hostname: hdk-42 + role: corerouter + model: "ubnt_unifiac-mesh" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2200::/56' + +# Router: 10.248.6.128/26 2001:bf7:840:2200::/56 +# --MGMT: 10.248.6.128/28 +# --MESH: 10.248.6.144/28 +# --DHCP: 10.248.6.160/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.160/27 + ipv6_subprefix: 0 + assignments: + hdk-42: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.6.144/32 + ipv6_subprefix: -20 + mesh_ap: hdk-42 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.6.145/32 + ipv6_subprefix: -21 + mesh_ap: hdk-42 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.6.128/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.6.129/28 + hdk-42: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-42: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-42: 13-20 From 851ac16b9342bb0504ba2d9cc8715ca157d45c17 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Tue, 16 Jul 2024 11:56:18 +0200 Subject: [PATCH 13/32] model: add comfast cf we72 v1 --- group_vars/model_comfast_cf_ew72_v1.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 group_vars/model_comfast_cf_ew72_v1.yml diff --git a/group_vars/model_comfast_cf_ew72_v1.yml b/group_vars/model_comfast_cf_ew72_v1.yml new file mode 100644 index 000000000..4608ed035 --- /dev/null +++ b/group_vars/model_comfast_cf_ew72_v1.yml @@ -0,0 +1,20 @@ +--- +override_target: "mikrotik_routerboard-lhg-2nd" +target: ath79/mikrotik +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 From c8097bcf46e92c364e4941271fff15ac8802ae67 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Tue, 16 Jul 2024 11:56:36 +0200 Subject: [PATCH 14/32] hdk-64: add new location --- locations/hdk-64.yml | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 locations/hdk-64.yml diff --git a/locations/hdk-64.yml b/locations/hdk-64.yml new file mode 100644 index 000000000..b6428a734 --- /dev/null +++ b/locations/hdk-64.yml @@ -0,0 +1,76 @@ +--- +location: hdk-64 +location_nice: Heidekampgraben 64 +latitude: 552.4783508 +longitude: 13.47084805 +community: true + +hosts: + - hostname: hdk-64 + role: corerouter + model: "comfast_cf-ew72-v1" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2300::/56' + +# Router: 10.248.6.192/26 2001:bf7:840:2300::/56 +# --MGMT: 10.248.6.192/28 +# --MESH: 10.248.6.208/28 +# --DHCP: 10.248.6.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.6.224/27 + ipv6_subprefix: 0 + assignments: + hdk-64: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.6.208/32 + ipv6_subprefix: -20 + mesh_ap: hdk-64 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.6.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-64 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.6.192/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.6.193/28 + hdk-64: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-64: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-64: 13-20 From 4a82a5cee5c9c4ded1a5414753ce7830e939216e Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Tue, 16 Jul 2024 13:37:14 +0200 Subject: [PATCH 15/32] model: comfast cf ew72: fix modelfile --- ...{model_comfast_cf_ew72_v1.yml => model_comfast_cf_ew72.yml} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename group_vars/{model_comfast_cf_ew72_v1.yml => model_comfast_cf_ew72.yml} (82%) diff --git a/group_vars/model_comfast_cf_ew72_v1.yml b/group_vars/model_comfast_cf_ew72.yml similarity index 82% rename from group_vars/model_comfast_cf_ew72_v1.yml rename to group_vars/model_comfast_cf_ew72.yml index 4608ed035..86b19751e 100644 --- a/group_vars/model_comfast_cf_ew72_v1.yml +++ b/group_vars/model_comfast_cf_ew72.yml @@ -1,6 +1,5 @@ --- -override_target: "mikrotik_routerboard-lhg-2nd" -target: ath79/mikrotik +target: ath79/generic brand_nice: COMFAST model_nice: CF-EW72 version_nice: v1 From 9c602b3df58b24e5a9fecfc1d67e13e0a0ae46cd Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Tue, 16 Jul 2024 13:37:32 +0200 Subject: [PATCH 16/32] hdk-64: fix location --- locations/hdk-64.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locations/hdk-64.yml b/locations/hdk-64.yml index b6428a734..0f5db5214 100644 --- a/locations/hdk-64.yml +++ b/locations/hdk-64.yml @@ -1,14 +1,14 @@ --- location: hdk-64 location_nice: Heidekampgraben 64 -latitude: 552.4783508 +latitude: 52.4783508 longitude: 13.47084805 community: true hosts: - hostname: hdk-64 role: corerouter - model: "comfast_cf-ew72-v1" + model: "comfast_cf-ew72" wireless_profile: freifunk_default ipv6_prefix: '2001:bf7:840:2300::/56' From 4ce695b1c189d7a215cb1e95c48be2b878af9bf9 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Tue, 16 Jul 2024 14:01:50 +0200 Subject: [PATCH 17/32] model: comfast cf e130n v2: add model --- group_vars/model_comfast_cf_e130n_v2.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 group_vars/model_comfast_cf_e130n_v2.yml diff --git a/group_vars/model_comfast_cf_e130n_v2.yml b/group_vars/model_comfast_cf_e130n_v2.yml new file mode 100644 index 000000000..125c9a142 --- /dev/null +++ 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 From c86a71c300cce1b36dfcbe0e47a912e537fe30b7 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Tue, 16 Jul 2024 14:02:13 +0200 Subject: [PATCH 18/32] hdk-53: add location --- locations/hdk-53.yml | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 locations/hdk-53.yml diff --git a/locations/hdk-53.yml b/locations/hdk-53.yml new file mode 100644 index 000000000..51d63d204 --- /dev/null +++ b/locations/hdk-53.yml @@ -0,0 +1,62 @@ +--- +location: hdk-53 +location_nice: Heidekampgraben 53 +latitude: 52.478446 +longitude: 13.472099 +community: true + +hosts: + - hostname: hdk-53 + role: corerouter + model: "comfast_cf-e130n-v2" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2500::/56' + +# Router: 10.248.7.0/26 2001:bf7:840:2500::/56 +# --MGMT: 10.248.7.0/28 +# --MESH: 10.248.7.16/28 +# --DHCP: 10.248.7.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.7.32/27 + ipv6_subprefix: 0 + assignments: + hdk-53: 1 + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.7.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-53 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.7.0/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.7.1/28 + hdk-53: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-53: 13-20 From 74d90be9af9b88ffb2f9619c8c2ed35fa1fe79c5 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Wed, 17 Jul 2024 13:57:11 +0200 Subject: [PATCH 19/32] hdk-8: add location --- locations/hdk-8.yml | 76 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 locations/hdk-8.yml diff --git a/locations/hdk-8.yml b/locations/hdk-8.yml new file mode 100644 index 000000000..54aaa9290 --- /dev/null +++ b/locations/hdk-8.yml @@ -0,0 +1,76 @@ +--- +location: hdk-8 +location_nice: Heidekampgraben 8 +latitude: 52.478225886 +longitude: 13.473057747 +community: true + +hosts: + - hostname: hdk-8 + role: corerouter + model: "avm_fritzbox-7530" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2700::/56' + +# Router: 10.248.7.128/26 2001:bf7:840:2700::/56 +# --MGMT: 10.248.7.128/28 +# --MESH: 10.248.7.144/28 +# --DHCP: 10.248.7.160/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.7.160/27 + ipv6_subprefix: 0 + assignments: + hdk-8: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.7.144/32 + ipv6_subprefix: -20 + mesh_ap: hdk-8 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.7.145/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-8 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.7.128/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.7.129/28 + hdk-8: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-8: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-8: 13-20 From c750bb4f186ea108688a4f36ed8a6bf69e018d35 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Thu, 18 Jul 2024 11:04:36 +0200 Subject: [PATCH 20/32] hdk-78a: add new location --- locations/hdk-78a.yml | 72 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 locations/hdk-78a.yml diff --git a/locations/hdk-78a.yml b/locations/hdk-78a.yml new file mode 100644 index 000000000..614c5e55c --- /dev/null +++ b/locations/hdk-78a.yml @@ -0,0 +1,72 @@ +--- +location: hdk-78a +location_nice: Heidekampgraben 87a +latitude: 52.478624490 +longitude: 13.469903469 +community: true + +hosts: + - hostname: hdk-78a + role: corerouter + model: "tplink_cpe210-v1" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2800::/56' + +# Router: 10.248.7.192/26 2001:bf7:840:2800::/56 +# --MGMT: 10.248.7.192/28 +# --MESH: 10.248.7.208/28 +# --DHCP: 10.248.7.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.7.224/27 + ipv6_subprefix: 0 + assignments: + hdk-78a: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.7.208/32 + ipv6_subprefix: -20 + mesh_ap: hdk-78a + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.7.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-78a + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.7.192/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.7.193/28 + hdk-78a: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-78a: 13-20 From 5fdc20a0d7b72b4174040cd12e0e12829530d7ce Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Thu, 18 Jul 2024 11:04:52 +0200 Subject: [PATCH 21/32] hdk-88m: add location --- locations/hdk-88m.yml | 76 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 locations/hdk-88m.yml diff --git a/locations/hdk-88m.yml b/locations/hdk-88m.yml new file mode 100644 index 000000000..234c2aa6d --- /dev/null +++ b/locations/hdk-88m.yml @@ -0,0 +1,76 @@ +--- +location: hdk-88m +location_nice: Heidekampgraben 88m +latitude: 52.478225886 +longitude: 13.473057747 +community: true + +hosts: + - hostname: hdk-88m + role: corerouter + model: "avm_fritzbox-7320" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2600::/56' + +# Router: 10.248.7.64/26 2001:bf7:840:2600::/56 +# --MGMT: 10.248.7.64/28 +# --MESH: 10.248.7.80/28 +# --DHCP: 10.248.7.96/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.7.96/27 + ipv6_subprefix: 0 + assignments: + hdk-88m: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.7.80/32 + ipv6_subprefix: -20 + mesh_ap: hdk-88m + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.7.81/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-88m + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.7.64/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.7.65/28 + hdk-88m: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-88m: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-88m: 13-20 From d4e0a65c98f4d7f7f1754acd9ab677b7aac0f729 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Thu, 18 Jul 2024 11:05:07 +0200 Subject: [PATCH 22/32] model: fritzbox 7320: add new router --- group_vars/model_avm_fritzbox_7320.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 group_vars/model_avm_fritzbox_7320.yml diff --git a/group_vars/model_avm_fritzbox_7320.yml b/group_vars/model_avm_fritzbox_7320.yml new file mode 100644 index 000000000..a7a7670c3 --- /dev/null +++ b/group_vars/model_avm_fritzbox_7320.yml @@ -0,0 +1,15 @@ +--- +override_target: "avm_fritz7320" +target: lantiq/xway +brand_nice: AVM +model_nice: FRITZ!Box 7320 + +int_port: eth0 +low_mem: true + +wireless_devices: + - name: 11g_standard + band: 2g + htmode_prefix: HT + path: pci0000:00/0000:00:0e.0 + ifname_hint: wlan2 From 36e468d4f0616cabfc16ad35d0ea9143ca43d1e3 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Thu, 18 Jul 2024 15:12:30 +0200 Subject: [PATCH 23/32] hdk-23: add location --- locations/hdk-23.yml | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 locations/hdk-23.yml diff --git a/locations/hdk-23.yml b/locations/hdk-23.yml new file mode 100644 index 000000000..aac1c271c --- /dev/null +++ b/locations/hdk-23.yml @@ -0,0 +1,76 @@ +--- +location: hdk-23 +location_nice: Heidekampgraben 23 +latitude: 52.477739061000001 +longitude: 13.471067548000001 +community: true + +hosts: + - hostname: hdk-23 + role: corerouter + model: "avm_fritzbox-7320" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2c00::/56' + +# Router: 10.248.8.192/26 2001:bf7:840:2c00::/56 +# --MGMT: 10.248.8.192/28 +# --MESH: 10.248.8.208/28 +# --DHCP: 10.248.8.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.8.224/27 + ipv6_subprefix: 0 + assignments: + hdk-23: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.8.208/32 + ipv6_subprefix: -20 + mesh_ap: hdk-23 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.8.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-23 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.8.192/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.8.193/28 + hdk-23: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-23: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-23: 13-20 From d000f45ed994feb294d9375c93b5e3b2a93c530f Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Thu, 18 Jul 2024 15:12:47 +0200 Subject: [PATCH 24/32] hdk-24: add new location --- locations/hdk-24.yml | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 locations/hdk-24.yml diff --git a/locations/hdk-24.yml b/locations/hdk-24.yml new file mode 100644 index 000000000..970afdb43 --- /dev/null +++ b/locations/hdk-24.yml @@ -0,0 +1,76 @@ +--- +location: hdk-24 +location_nice: Heidekampgraben 24 +latitude: 52.477859951 +longitude: 13.470954895 +community: true + +hosts: + - hostname: hdk-24 + role: corerouter + model: "speedport_w-504v-typ-a" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2b00::/56' + +# Router: 10.248.8.128/26 2001:bf7:840:2b00::/56 +# --MGMT: 10.248.8.128/28 +# --MESH: 10.248.8.144/28 +# --DHCP: 10.248.8.160/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.8.160/27 + ipv6_subprefix: 0 + assignments: + hdk-24: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.8.144/32 + ipv6_subprefix: -20 + mesh_ap: hdk-24 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.8.145/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-24 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.8.128/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.8.129/28 + hdk-24: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-24: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-24: 13-20 From 0d84474c44d0e121a02e1ecfa96f233c2505890b Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Thu, 18 Jul 2024 15:13:01 +0200 Subject: [PATCH 25/32] hdk-39: add location --- locations/hdk-39.yml | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 locations/hdk-39.yml diff --git a/locations/hdk-39.yml b/locations/hdk-39.yml new file mode 100644 index 000000000..1e075afac --- /dev/null +++ b/locations/hdk-39.yml @@ -0,0 +1,76 @@ +--- +location: hdk-39 +location_nice: Heidekampgraben 39 +latitude: 52.478578750 +longitude: 13.472220898 +community: true + +hosts: + - hostname: hdk-39 + role: corerouter + model: "avm_fritzbox-7530" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2900::/56' + +# Router: 10.248.8.0/26 2001:bf7:840:2900::/56 +# --MGMT: 10.248.8.0/28 +# --MESH: 10.248.8.16/28 +# --DHCP: 10.248.8.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.8.32/27 + ipv6_subprefix: 0 + assignments: + hdk-39: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.8.16/32 + ipv6_subprefix: -20 + mesh_ap: hdk-39 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.8.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-39 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.8.0/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.8.1/28 + hdk-39: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-39: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-39: 13-20 From c447c5c356fd54a73e074ff8788c050445b2305b Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Thu, 18 Jul 2024 15:13:14 +0200 Subject: [PATCH 26/32] hdk-47a: add new location --- locations/hdk-47a.yml | 76 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 locations/hdk-47a.yml diff --git a/locations/hdk-47a.yml b/locations/hdk-47a.yml new file mode 100644 index 000000000..f9e27a91c --- /dev/null +++ b/locations/hdk-47a.yml @@ -0,0 +1,76 @@ +--- +location: hdk-47a +location_nice: Heidekampgraben 47a +latitude: 52.47883095205514 +longitude: 13.47129945930971 +community: true + +hosts: + - hostname: hdk-47a + role: corerouter + model: "glinet_gl-ar300m-nor" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2e00::/56' + +# Router: 10.248.9.64/26 2001:bf7:840:2e00::/56 +# --MGMT: 10.248.9.64/28 +# --MESH: 10.248.9.80/28 +# --DHCP: 10.248.9.96/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.9.96/27 + ipv6_subprefix: 0 + assignments: + hdk-47a: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.9.80/32 + ipv6_subprefix: -20 + mesh_ap: hdk-47a + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.9.81/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-47a + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.9.64/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.9.65/28 + hdk-47a: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-47a: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-47a: 13-20 From 045bb68603950fbda6fa4e922439399492e311a5 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Thu, 18 Jul 2024 15:13:28 +0200 Subject: [PATCH 27/32] hdk-80: add location --- locations/hdk-80.yml | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 locations/hdk-80.yml diff --git a/locations/hdk-80.yml b/locations/hdk-80.yml new file mode 100644 index 000000000..e175fe537 --- /dev/null +++ b/locations/hdk-80.yml @@ -0,0 +1,76 @@ +--- +location: hdk-80 +location_nice: Heidekampgraben 80 +latitude: 52.4783508 +longitude: 13.47084805 +community: true + +hosts: + - hostname: hdk-80 + role: corerouter + model: "comfast_cf-ew72" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2d00::/56' + +# Router: 10.248.9.0/26 2001:bf7:840:2d00::/56 +# --MGMT: 10.248.9.0/28 +# --MESH: 10.248.9.16/28 +# --DHCP: 10.248.9.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.9.32/27 + ipv6_subprefix: 0 + assignments: + hdk-80: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.9.16/32 + ipv6_subprefix: -20 + mesh_ap: hdk-80 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.9.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-80 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.9.0/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.9.1/28 + hdk-80: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-80: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-80: 13-20 From 2c97d678600967dab7bcd52a6a54b6b431f87d0a Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Thu, 18 Jul 2024 15:13:44 +0200 Subject: [PATCH 28/32] hdk-85b: add location --- locations/hdk-85b.yml | 76 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 locations/hdk-85b.yml diff --git a/locations/hdk-85b.yml b/locations/hdk-85b.yml new file mode 100644 index 000000000..055c616b2 --- /dev/null +++ b/locations/hdk-85b.yml @@ -0,0 +1,76 @@ +--- +location: hdk-85b +location_nice: Heidekampgraben 85b +latitude: 52.479624490 +longitude: 13.47 +community: true + +hosts: + - hostname: hdk-85b + role: corerouter + model: "tplink_eap225-outdoor-v3" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2a00::/56' + +# Router: 10.248.8.64/26 2001:bf7:840:2a00::/56 +# --MGMT: 10.248.8.64/28 +# --MESH: 10.248.8.80/28 +# --DHCP: 10.248.8.96/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.8.96/27 + ipv6_subprefix: 0 + assignments: + hdk-85b: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.8.80/32 + ipv6_subprefix: -20 + mesh_ap: hdk-85b + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.8.81/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-85b + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.8.96/27 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.8.97/27 + hdk-85b: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-85b: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-85b: 13-20 From 812d4704b420ad763dddc6a980937b61579808be Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Thu, 18 Jul 2024 15:14:30 +0200 Subject: [PATCH 29/32] model: add glinet gl ar300m nor --- group_vars/model_glinet_gl_ar300m_nor.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 group_vars/model_glinet_gl_ar300m_nor.yml diff --git a/group_vars/model_glinet_gl_ar300m_nor.yml b/group_vars/model_glinet_gl_ar300m_nor.yml new file mode 100644 index 000000000..fe279e269 --- /dev/null +++ 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 From 2a7adf173b0d3c373ea41ee25cfe0a66ef64241d Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Thu, 18 Jul 2024 15:14:56 +0200 Subject: [PATCH 30/32] model: add speedport w 50v typ a --- group_vars/model_speedport_w_504v_typ_a.yml | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 group_vars/model_speedport_w_504v_typ_a.yml diff --git a/group_vars/model_speedport_w_504v_typ_a.yml b/group_vars/model_speedport_w_504v_typ_a.yml new file mode 100644 index 000000000..32ad583c4 --- /dev/null +++ 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 From 46d8619cfdf184a3ba53cddc1573442def65d0b4 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Fri, 19 Jul 2024 15:27:41 +0200 Subject: [PATCH 31/32] hdk-59: add location --- locations/hdk-59.yml | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 locations/hdk-59.yml diff --git a/locations/hdk-59.yml b/locations/hdk-59.yml new file mode 100644 index 000000000..5dcf62185 --- /dev/null +++ b/locations/hdk-59.yml @@ -0,0 +1,76 @@ +--- +location: hdk-59 +location_nice: Heidekampgraben 59 +latitude: 52.478078 +longitude: 13.471925 +community: true + +hosts: + - hostname: hdk-59 + role: corerouter + model: "avm_fritzbox-7530" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:2f00::/56' + +# Router: 10.31.244.128/26 2001:bf7:840:2f00::/56 +# --MGMT: 10.31.244.128/28 +# --MESH: 10.31.244.144/28 +# --DHCP: 10.31.244.160/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.31.244.160/27 + ipv6_subprefix: 0 + assignments: + hdk-59: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.31.244.144/32 + ipv6_subprefix: -20 + mesh_ap: hdk-59 + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2ghz + prefix: 10.31.244.145/32 + ipv6_subprefix: -2 + # make mesh_metric(s) for 2GHz worse than 5GHz + mesh_metric: 1024 + mesh_metric_lqm: ['default 0.8'] + mesh_ap: hdk-59 + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.31.244.128/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.31.244.129/28 + hdk-59: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-59: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-59: 13-20 From 2e9e0b63b47fe58fb186f8ccf146bf7d754564b4 Mon Sep 17 00:00:00 2001 From: freifunkoperator Date: Tue, 17 Dec 2024 22:51:33 +0100 Subject: [PATCH 32/32] some changes i dont know anymore --- group_vars/all/imageprofile.yml | 9 +++ group_vars/model_avm_fritzbox_7320.yml | 1 + group_vars/model_dlink_dap_x1860_a1.yml | 1 + group_vars/model_tplink_cpe210_v1.yml | 4 ++ group_vars/model_tplink_tl_mr3020_v3.yml | 18 +++++ group_vars/model_ubnt_unifiac_mesh.yml | 4 +- group_vars/role_corerouter/imageprofile.yml | 9 --- locations/hdk-0.yml | 3 + locations/hdk-13.yml | 76 +++++++++++++++++++++ locations/hdk-15.yml | 3 + locations/hdk-17.yml | 3 + locations/hdk-17f.yml | 76 +++++++++++++++++++++ locations/hdk-42.yml | 3 + locations/hdk-6.yml | 3 + locations/hdk-66b.yml | 3 + 15 files changed, 205 insertions(+), 11 deletions(-) create mode 100644 group_vars/model_tplink_tl_mr3020_v3.yml create mode 100644 locations/hdk-13.yml create mode 100644 locations/hdk-17f.yml diff --git a/group_vars/all/imageprofile.yml b/group_vars/all/imageprofile.yml index 81c1a94a1..32336c8ee 100644 --- 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 index a7a7670c3..9870445ae 100644 --- a/group_vars/model_avm_fritzbox_7320.yml +++ b/group_vars/model_avm_fritzbox_7320.yml @@ -6,6 +6,7 @@ model_nice: FRITZ!Box 7320 int_port: eth0 low_mem: true +low_flash: true wireless_devices: - name: 11g_standard diff --git a/group_vars/model_dlink_dap_x1860_a1.yml b/group_vars/model_dlink_dap_x1860_a1.yml index 90e9f756f..0e4b6a377 100644 --- 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_tplink_cpe210_v1.yml b/group_vars/model_tplink_cpe210_v1.yml index de356fa60..c3c80fac5 100644 --- 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_tl_mr3020_v3.yml b/group_vars/model_tplink_tl_mr3020_v3.yml new file mode 100644 index 000000000..474efcc11 --- /dev/null +++ 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 index 1825b6a2f..0a64eae0e 100644 --- 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 diff --git a/group_vars/role_corerouter/imageprofile.yml b/group_vars/role_corerouter/imageprofile.yml index 868111950..fce1b11c2 100644 --- 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 index c91422af3..168d65966 100644 --- a/locations/hdk-0.yml +++ b/locations/hdk-0.yml @@ -49,6 +49,9 @@ networks: 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 diff --git a/locations/hdk-13.yml b/locations/hdk-13.yml new file mode 100644 index 000000000..42fca237e --- /dev/null +++ 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 diff --git a/locations/hdk-15.yml b/locations/hdk-15.yml index 4c26c55e5..5cf6be171 100644 --- a/locations/hdk-15.yml +++ b/locations/hdk-15.yml @@ -51,6 +51,9 @@ networks: name: mesh_2g prefix: 10.248.5.81/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-15 mesh_radio: 11g_standard mesh_iface: mesh diff --git a/locations/hdk-17.yml b/locations/hdk-17.yml index f61cb0f36..b7dd09fee 100644 --- a/locations/hdk-17.yml +++ b/locations/hdk-17.yml @@ -63,6 +63,9 @@ networks: name: mesh_2g prefix: 10.31.207.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-17 mesh_radio: 11g_standard mesh_iface: mesh diff --git a/locations/hdk-17f.yml b/locations/hdk-17f.yml new file mode 100644 index 000000000..078f1e797 --- /dev/null +++ b/locations/hdk-17f.yml @@ -0,0 +1,76 @@ +--- +location: hdk-17f +location_nice: Heidekampgraben 17f +latitude: 52.478675 +longitude: 13.471268 +community: true + +hosts: + - hostname: hdk-17f + role: corerouter + model: "avm_fritzbox-7530" + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:840:3000::/56' + +# Router: 10.248.10.128/26 2001:bf7:840:3000::/56 +# --MGMT: 10.248.10.128/28 +# --MESH: 10.248.10.144/28 +# --DHCP: 10.248.10.160/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.160/27 + ipv6_subprefix: 0 + assignments: + hdk-17f: 1 + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.10.144/32 + ipv6_subprefix: -20 + mesh_ap: hdk-17f + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.10.145/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-17f + mesh_radio: 11g_standard + mesh_iface: mesh + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.10.128/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + # 10.248.10.129/28 + hdk-17f: 1 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hdk-17f: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hdk-17f: 13-20 diff --git a/locations/hdk-42.yml b/locations/hdk-42.yml index 8e07555b0..51c05ebc4 100644 --- a/locations/hdk-42.yml +++ b/locations/hdk-42.yml @@ -49,6 +49,9 @@ networks: name: mesh_2g prefix: 10.248.6.145/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-42 mesh_radio: 11g_standard mesh_iface: mesh diff --git a/locations/hdk-6.yml b/locations/hdk-6.yml index 94651bf9e..f46443111 100644 --- a/locations/hdk-6.yml +++ b/locations/hdk-6.yml @@ -51,6 +51,9 @@ networks: name: mesh_2g prefix: 10.248.5.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-6 mesh_radio: 11g_standard mesh_iface: mesh diff --git a/locations/hdk-66b.yml b/locations/hdk-66b.yml index c485f61e8..60c93c5e9 100644 --- a/locations/hdk-66b.yml +++ b/locations/hdk-66b.yml @@ -51,6 +51,9 @@ networks: name: mesh_2g prefix: 10.248.5.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-66b mesh_radio: 11g_standard mesh_iface: mesh