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 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 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 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 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