From 91960c761db82aa948738cb385166c1f5df33a38 Mon Sep 17 00:00:00 2001 From: Tom Jannek Date: Fri, 17 Oct 2025 21:50:24 +0200 Subject: [PATCH 1/3] hacrafu-conchiglioni: init location, replace falter --- locations/hacrafu-conchiglioni.yml | 105 +++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 locations/hacrafu-conchiglioni.yml diff --git a/locations/hacrafu-conchiglioni.yml b/locations/hacrafu-conchiglioni.yml new file mode 100644 index 000000000..1bdc92d3c --- /dev/null +++ b/locations/hacrafu-conchiglioni.yml @@ -0,0 +1,105 @@ +--- + +location: hacrafu-conchiglioni +location_nice: Seeschloss, Altlandsberger Chaussee 102, 15345 Eggersdorf +latitude: 52.55753549153633 +longitude: 13.830591953371984 +contact_name: "Hacken Craften Funken e.V." +contact_nickname: "HaCraFu e.V." +contacts: + - "freifunk@hacrafu.de" + +hosts: + + - hostname: hacrafu-conchiglioni + role: corerouter + model: "cudy_wr3000-v1" + wireless_profile: freifunk_hacrafu + host__rclocal__to_merge: + - | + uci set network.vlan_40.ports='lan1:u lan2:u lan3:u' + uci set network.vlan_50.ports='wan:u' + uci commit network; reload_config + +ipv6_prefix: "2001:bf7:850:3500::/56" + +# dhcp 10.248.47.192/26 +# mesh 10.248.45.52/31 +# MGMT 10.248.45.47/32 +# TUNNEL 10.248.45.54/31 + +networks: + + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_5g + prefix: 10.248.45.52/32 + ipv6_subprefix: -20 + mesh_ap: hacrafu-conchiglioni + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_2g + prefix: 10.248.45.53/32 + ipv6_subprefix: -21 + mesh_metric_lqm: ['default 0.8'] # prefer 5 GHz Mesh + mesh_ap: hacrafu-conchiglioni + mesh_radio: 11g_standard + mesh_iface: mesh + + # DHCP + - vid: 40 + role: dhcp + inbound_filtering: true + enforce_client_isolation: true + prefix: 10.248.47.192/26 + ipv6_subprefix: 0 + assignments: + hacrafu-conchiglioni: 1 + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.45.47/32 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + hacrafu-conchiglioni: 1 + + # UPLINK + - vid: 50 + role: uplink + + - role: tunnel + ifname: ts_wg0 + mtu: 1280 + prefix: 10.248.45.54/32 + wireguard_port: 51820 + + - role: tunnel + ifname: ts_wg1 + mtu: 1280 + prefix: 10.248.45.55/32 + wireguard_port: 51821 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + hacrafu-conchiglioni: 36-80 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + hacrafu-conchiglioni: 13-40 + +# only place this ssh-keys +ssh_keys: + - comment: Tom + key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICIpPZouLOf+1WT9ylMa/9mX1dhLTy8W07Q8G5w7KKNz freifunk@hacrafu.de + - comment: Bob + key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHrBKcGS+pyrN4MvRNqg7TPA2EsJ0cDCYLjrDRlTO6k HaCraFu bob@bobgoehler.de + - comment: Peter + key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFIzevq2nqgb0rBAEEcDEkAIu24aTiWIkem3+59a6h10 HaCraFu Petersilie From cb0e3d8fc6a18c1edfc769b9394cf439391dd4fe Mon Sep 17 00:00:00 2001 From: Tom Jannek Date: Sun, 9 Nov 2025 23:34:16 +0100 Subject: [PATCH 2/3] hacrafu-conchiglioni: add 3 APs, expand mesh/mgmt IPs --- locations/hacrafu-conchiglioni.yml | 106 ++++++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 9 deletions(-) diff --git a/locations/hacrafu-conchiglioni.yml b/locations/hacrafu-conchiglioni.yml index 1bdc92d3c..9d211d475 100644 --- a/locations/hacrafu-conchiglioni.yml +++ b/locations/hacrafu-conchiglioni.yml @@ -10,31 +10,47 @@ contacts: - "freifunk@hacrafu.de" hosts: - - hostname: hacrafu-conchiglioni role: corerouter model: "cudy_wr3000-v1" wireless_profile: freifunk_hacrafu host__rclocal__to_merge: - | - uci set network.vlan_40.ports='lan1:u lan2:u lan3:u' + uci set network.vlan_40.ports='lan1:t lan2:t lan3:u' uci set network.vlan_50.ports='wan:u' uci commit network; reload_config + # Saal-AP: Panoramasaal Schwanenblick + - hostname: hacrafu-conchiglioni-swan + role: ap + model: "tplink_archer-c50-v4" + wireless_profile: freifunk_hacrafu + + # Saal-AP: Schlossherrenzimmer + - hostname: hacrafu-conchiglioni-mill + role: ap + model: "tplink_archer-c50-v4" + wireless_profile: freifunk_hacrafu + + # Hotel-AP: Schlafzimmer + - hostname: hacrafu-conchiglioni-nap + role: ap + model: "tplink_archer-c50-v4" + wireless_profile: freifunk_hacrafu + ipv6_prefix: "2001:bf7:850:3500::/56" -# dhcp 10.248.47.192/26 -# mesh 10.248.45.52/31 -# MGMT 10.248.45.47/32 +# DHCP 10.248.47.192/26 +# MESH 10.31.233.144/28 +# MGMT 10.248.86.232/29 # TUNNEL 10.248.45.54/31 networks: - # MESH - 5 GHz 802.11s - vid: 20 role: mesh name: mesh_5g - prefix: 10.248.45.52/32 + prefix: 10.31.233.144/32 ipv6_subprefix: -20 mesh_ap: hacrafu-conchiglioni mesh_radio: 11a_standard @@ -44,13 +60,76 @@ networks: - vid: 21 role: mesh name: mesh_2g - prefix: 10.248.45.53/32 + prefix: 10.31.233.145/32 ipv6_subprefix: -21 mesh_metric_lqm: ['default 0.8'] # prefer 5 GHz Mesh mesh_ap: hacrafu-conchiglioni mesh_radio: 11g_standard mesh_iface: mesh + # MESH - 5 GHz 802.11s - AP Swan + - vid: 22 + role: mesh + name: mesh_5g_swan + prefix: 10.31.233.146/32 + ipv6_subprefix: -22 + mesh_ap: hacrafu-conchiglioni-swan + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s - AP Swan + - vid: 23 + role: mesh + name: mesh_2g_swan + prefix: 10.31.233.147/32 + ipv6_subprefix: -23 + mesh_metric_lqm: ['default 0.8'] # prefer 5 GHz Mesh + mesh_ap: hacrafu-conchiglioni-swan + mesh_radio: 11g_standard + mesh_iface: mesh + + # MESH - 5 GHz 802.11s - AP Mill + - vid: 24 + role: mesh + name: mesh_5g_mill + prefix: 10.31.233.148/32 + ipv6_subprefix: -24 + mesh_ap: hacrafu-conchiglioni-mill + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s - AP Mill + - vid: 25 + role: mesh + name: mesh_2g_mill + prefix: 10.31.233.149/32 + ipv6_subprefix: -25 + mesh_metric_lqm: ['default 0.8'] # prefer 5 GHz Mesh + mesh_ap: hacrafu-conchiglioni-mill + mesh_radio: 11g_standard + mesh_iface: mesh + + # MESH - 5 GHz 802.11s - AP Nap + - vid: 26 + role: mesh + name: mesh_5g_nap + prefix: 10.31.233.150/32 + ipv6_subprefix: -26 + mesh_ap: hacrafu-conchiglioni-nap + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s - AP Nap + - vid: 27 + role: mesh + name: mesh_2g_nap + prefix: 10.31.233.151/32 + ipv6_subprefix: -27 + mesh_metric_lqm: ['default 0.8'] # prefer 5 GHz Mesh + mesh_ap: hacrafu-conchiglioni-nap + mesh_radio: 11g_standard + mesh_iface: mesh + # DHCP - vid: 40 role: dhcp @@ -64,12 +143,15 @@ networks: # MGMT - vid: 42 role: mgmt - prefix: 10.248.45.47/32 + prefix: 10.248.86.232/29 gateway: 1 dns: 1 ipv6_subprefix: 1 assignments: hacrafu-conchiglioni: 1 + hacrafu-conchiglioni-swan: 2 + hacrafu-conchiglioni-mill: 3 + hacrafu-conchiglioni-nap: 4 # UPLINK - vid: 50 @@ -90,10 +172,16 @@ networks: # AP-id, wifi-channel, bandwidth, txpower location__channel_assignments_11a_standard__to_merge: hacrafu-conchiglioni: 36-80 + hacrafu-conchiglioni-swan: 36-80 + hacrafu-conchiglioni-mill: 36-80 + hacrafu-conchiglioni-nap: 36-80 # AP-id, wifi-channel, bandwidth, txpower location__channel_assignments_11g_standard__to_merge: hacrafu-conchiglioni: 13-40 + hacrafu-conchiglioni-swan: 13-40 + hacrafu-conchiglioni-mill: 13-40 + hacrafu-conchiglioni-nap: 13-40 # only place this ssh-keys ssh_keys: From a39c9d3a95327ea0b96d09354a0fbd076a1cf539 Mon Sep 17 00:00:00 2001 From: Tom Jannek Date: Mon, 10 Nov 2025 12:21:35 +0100 Subject: [PATCH 3/3] tag dhcp vlan on wan port --- locations/hacrafu-conchiglioni.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locations/hacrafu-conchiglioni.yml b/locations/hacrafu-conchiglioni.yml index 9d211d475..a789b3185 100644 --- a/locations/hacrafu-conchiglioni.yml +++ b/locations/hacrafu-conchiglioni.yml @@ -16,7 +16,7 @@ hosts: wireless_profile: freifunk_hacrafu host__rclocal__to_merge: - | - uci set network.vlan_40.ports='lan1:t lan2:t lan3:u' + uci set network.vlan_40.ports='wan:t lan1:t lan2:t lan3:u' uci set network.vlan_50.ports='wan:u' uci commit network; reload_config