diff --git a/locations/hirschhof.yml b/locations/hirschhof.yml index 581a1c193..6c65e1751 100644 --- a/locations/hirschhof.yml +++ b/locations/hirschhof.yml @@ -16,7 +16,6 @@ hosts: - hostname: hirschhof-k12 role: ap model: "tplink_cpe210-v1" - wireless_profile: freifunk_default wifi_roaming: true ipv6_prefix: '2001:bf7:760:2c00::/56' diff --git a/locations/k12-haus3.yml b/locations/k12-h1-h3n.yml similarity index 55% rename from locations/k12-haus3.yml rename to locations/k12-h1-h3n.yml index 7d57e2c20..504636f13 100644 --- a/locations/k12-haus3.yml +++ b/locations/k12-h1-h3n.yml @@ -1,28 +1,25 @@ --- -location: k12-haus3 -location_nice: 'Haus 3, Kastanienallee 12, 10435 Berlin' -latitude: 52.53951094884286 -longitude: 13.409447813490967 +location: k12-h1-h3n +location_nice: 'Haus1, Kastanienallee 12, 10435 Berlin' +latitude: 52.539219578693945 +longitude: 13.409907836874728 contact_nickname: 'zander' contacts: - 'alexanderjabs@gmx.de' hosts: - - hostname: k12-haus3-core + - hostname: k12-h1-h3n role: corerouter model: "dlink_dap-x1860-a1" wireless_profile: freifunk_default - host__rclocal__to_merge: - # Add service announcement for K12 Sunset Webcam - - "[ -z \"$(uci show olsrd | grep -F 'k12-sunset.olsr')\" ] && uci add_list olsrd.@LoadPlugin[1].service=\"http://k12-sunset.olsr:80|tcp|K12 Sunset Webcam\" && /etc/init.d/olsrd restart" -ipv6_prefix: '2001:bf7:760:700::/56' +ipv6_prefix: '2001:bf7:760:2e00::/56' # got following prefixes: -# Router: 10.31.226.192/26 -# --MGMT: 10.31.226.192/28 -# --MESH: 10.31.226.208/28 -# --DHCP: 10.31.226.224/27 +# Router: 10.248.19.192/26 +# --MGMT: 10.248.19.224/28 +# --MESH: 10.248.19.240/28 +# --DHCP: 10.248.19.192/27 # Disable noping dhcp_no_ping: false @@ -31,56 +28,53 @@ networks: # MESH - 5 GHz 802.11s - vid: 20 role: mesh - name: mesh_5g - prefix: 10.31.226.209/32 + name: mesh_core_5g + prefix: 10.248.19.240/32 ipv6_subprefix: -20 - mesh_ap: k12-haus3-core + mesh_ap: k12-h1-h3n mesh_radio: 11a_standard mesh_iface: mesh # MESH - 2.4 GHz 802.11s - vid: 21 role: mesh - name: mesh_2g - prefix: 10.31.226.210/32 + name: mesh_core_2g + prefix: 10.248.19.241/32 ipv6_subprefix: -21 # make mesh_metric(s) for 2GHz worse than 5GHz mesh_metric: 1024 mesh_metric_lqm: ['default 0.8'] - mesh_ap: k12-haus3-core + mesh_ap: k12-h1-h3n mesh_radio: 11g_standard mesh_iface: mesh # DHCP with filtering and isolation - vid: 40 role: dhcp - untagged: true inbound_filtering: true enforce_client_isolation: true - prefix: 10.31.226.224/27 + prefix: 10.248.19.192/27 ipv6_subprefix: 0 assignments: - k12-haus3-core: 1 + k12-h1-h3n: 1 # MGMT - vid: 42 role: mgmt - untagged: true - prefix: 10.31.226.192/28 + prefix: 10.248.19.224/28 gateway: 1 dns: 1 ipv6_subprefix: 1 assignments: - k12-haus3-core: 1 # 10.31.226.193 - k12-sunset: 2 # 10.31.226.194 + k12-h1-h3n: 1 # 10.248.19.225 # AP-id, wifi-channel, bandwidth, txpower location__channel_assignments_11a_standard__to_merge: - k12-haus3-core: 36-40 + k12-h1-h3n: 36-40 # AP-id, wifi-channel, bandwidth, txpower location__channel_assignments_11g_standard__to_merge: - k12-haus3-core: 13-20 + k12-h1-h3n: 13-20 dns_servers: # quad9 diff --git a/locations/k12-haus1.yml b/locations/k12-h1.yml similarity index 74% rename from locations/k12-haus1.yml rename to locations/k12-h1.yml index b76a9ea1c..19faaeaf6 100644 --- a/locations/k12-haus1.yml +++ b/locations/k12-h1.yml @@ -1,28 +1,17 @@ --- -location: k12-haus1 +location: k12-h1 location_nice: 'Kastanienallee 12, Haus 1' -latitude: 52.539219578693945 -longitude: 13.409907836874728 +latitude: 52.539199815 +longitude: 13.410111666 contact_nickname: 'zander' contacts: - 'alexanderjabs@gmx.de' -dns_servers: - # quad9 - - 9.9.9.9 - - 149.112.112.112 - - 2620:fe::fe - - 2620:fe::9 - # cloudflare - - 1.1.1.1 - - 1.0.0.1 - - 2606:4700:4700::1111 - - 2606:4700:4700::1001 - hosts: - - hostname: k12-haus1-core + - hostname: k12-h1-core role: corerouter - model: "dlink_dap-x1860-a1" + model: "dlink_covr-x1860-a1" + mac_override: {eth0: a8:63:7d:db:4d:4c} wireless_profile: freifunk_default ipv6_prefix: '2001:bf7:760:300::/56' @@ -37,40 +26,48 @@ ipv6_prefix: '2001:bf7:760:300::/56' 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.226.160/27 - ipv6_subprefix: 0 - assignments: - k12-haus1-core: 1 - # MESH - 5 GHz 802.11s - vid: 20 role: mesh - name: mesh_5g + name: mesh_core_5g prefix: 10.31.226.145/32 ipv6_subprefix: -20 - mesh_ap: k12-haus1-core + mesh_ap: k12-h1-core mesh_radio: 11a_standard mesh_iface: mesh # MESH - 2.4 GHz 802.11s - vid: 21 role: mesh - name: mesh_2g + name: mesh_core_2g prefix: 10.31.226.146/32 ipv6_subprefix: -21 # make mesh_metric(s) for 2GHz worse than 5GHz mesh_metric: 1024 mesh_metric_lqm: ['default 0.8'] - mesh_ap: k12-haus1-core + mesh_ap: k12-h1-core mesh_radio: 11g_standard mesh_iface: mesh + # MESH - LAN + - vid: 30 + role: mesh + name: mesh_lan + prefix: 10.31.226.147/32 + ipv6_subprefix: -30 + # adjust mesh_metric(s) to prefer this + mesh_metric: 128 + + # DHCP with filtering and isolation + - vid: 40 + role: dhcp + inbound_filtering: true + enforce_client_isolation: true + prefix: 10.31.226.160/27 + ipv6_subprefix: 0 + assignments: + k12-h1-core: 1 + # MGMT - vid: 42 role: mgmt @@ -79,12 +76,24 @@ networks: dns: 1 ipv6_subprefix: 1 assignments: - k12-haus1-core: 1 + k12-h1-core: 1 # AP-id, wifi-channel, bandwidth, txpower location__channel_assignments_11a_standard__to_merge: - k12-haus1-core: 36-40 + k12-h1-core: 36-40 # AP-id, wifi-channel, bandwidth, txpower location__channel_assignments_11g_standard__to_merge: - k12-haus1-core: 13-20 + k12-h1-core: 13-20 + +dns_servers: + # quad9 + - 9.9.9.9 + - 149.112.112.112 + - 2620:fe::fe + - 2620:fe::9 + # cloudflare + - 1.1.1.1 + - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 diff --git a/locations/k12-h2.yml b/locations/k12-h2.yml new file mode 100644 index 000000000..2f6dbdec3 --- /dev/null +++ b/locations/k12-h2.yml @@ -0,0 +1,188 @@ +--- +location: k12-h2 +location_nice: 'Haus2, Kastanienallee 12, 10435 Berlin' +latitude: 52.53936534993554 +longitude: 13.409738833169316 +altitude: 63 +contact_nickname: 'zander' +contacts: + - 'alexanderjabs@gmx.de' + +hosts: + - hostname: k12-h2-core + role: corerouter + model: "dlink_covr-x1860-a1" + mac_override: {eth0: a8:63:7d:db:4d:45} + wireless_profile: freifunk_default + wifi_roaming: true + + - hostname: k12-h2-cpe + role: ap + model: "mikrotik_sxtsq-5-ac" + mac_override: {eth0: 08:55:31:ea:e3:32} + wireless_profile: mesh_only + + - hostname: k12-h2-h1n + role: ap + model: "tplink_tl-wdr4300-v1" + wifi_roaming: true + + - hostname: k12-h2-h1s + role: ap + model: "dlink_covr-x1860-a1" + mac_override: {eth0: 0c:0e:76:cf:21:de} + wifi_roaming: true + +snmp_devices: + - hostname: k12-h2-segen + address: 10.31.158.195 + snmp_profile: airos_8 + +ipv6_prefix: '2001:bf7:760:2a00::/56' + +# got following prefixes: +# Router: 10.31.158.0/24 +# --DHCP: 10.31.158.0/25 +# --MESH: 10.31.158.128/26 +# --MGMT: 10.31.158.192/27 +# --UPLK: 10.31.158.224/27 + +networks: + # MESH - segen + - vid: 10 + role: mesh + name: mesh_segen + prefix: 10.31.158.128/32 + ipv6_subprefix: -10 + + # MESH - core - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_core_5g + prefix: 10.31.158.1129/32 + ipv6_subprefix: -20 + mesh_ap: k12-h2-core + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - core - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_core_2g + prefix: 10.31.158.130/32 + ipv6_subprefix: -21 + # make mesh_metric(s) for 2GHz worse than 5GHz + mesh_metric: 1024 + mesh_metric_lqm: ['default 0.8'] + mesh_ap: k12-h2-core + mesh_radio: 11g_standard + mesh_iface: mesh + + # MESH - 1s - 5 GHz 802.11s + - vid: 22 + role: mesh + name: mesh_h1s_5g + prefix: 10.31.158.131/32 + ipv6_subprefix: -22 + mesh_ap: k12-h2-h1s + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 1s -2.4 GHz 802.11s + - vid: 23 + role: mesh + name: mesh_h1s_2g + prefix: 10.31.158.132/32 + ipv6_subprefix: -23 + # make mesh_metric(s) for 2GHz worse than 5GHz + mesh_metric: 1024 + mesh_metric_lqm: ['default 0.8'] + mesh_ap: k12-h2-h1s + mesh_radio: 11g_standard + mesh_iface: mesh + + # MESH - 5 GHz 802.11s - cpe + - vid: 24 + role: mesh + name: mesh_cpe + prefix: 10.31.158.133/32 + ipv6_subprefix: -24 + mesh_ap: k12-h2-cpe + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - LAN + - vid: 30 + role: mesh + name: mesh_lan + prefix: 10.31.226.134/32 + ipv6_subprefix: -30 + # adjust mesh_metric(s) to prefer this + mesh_metric: 128 + + # DHCP + - vid: 40 + role: dhcp + inbound_filtering: true + enforce_client_isolation: true + prefix: 10.31.158.0/25 + ipv6_subprefix: 0 + assignments: + k12-h2-core: 1 + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.31.158.192/26 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + k12-h2-core: 1 # 10.31.158.193/32 + k12-h2-switch: 2 # 10.31.158.194/32 + k12-h2-segen: 3 # 10.31.158.195/32 + # NF Antennas # 10.31.158.196/32 + k12-h2-cpe: 5 # 10.31.158.197/32 + k12-h2-h1n: 6 # 10.31.158.198/32 + k12-h2-h1s: 7 # 10.31.158.199/32 + + # UPLK + - vid: 50 + role: uplink + + - role: tunnel + ifname: ts_wg0 + mtu: 1280 + prefix: 10.31.158.224/32 + wireguard_port: 51820 + + - role: tunnel + ifname: ts_wg1 + mtu: 1280 + prefix: 10.31.158.225/32 + wireguard_port: 51821 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + k12-h2-core: 36-40 + k12-h2-h1n: 36-40 + k12-h2-h1s: 36-40 + k12-h2-cpe: 44-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + k12-h2-core: 13-20 + k12-h2-h1n: 13-20 + k12-h2-h1s: 13-20 + +dns_servers: + # quad9 + - 9.9.9.9 + - 149.112.112.112 + - 2620:fe::fe + - 2620:fe::9 + # cloudflare + - 1.1.1.1 + - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 diff --git a/locations/k12-3v0s.yml b/locations/k12-h3-v0s.yml similarity index 85% rename from locations/k12-3v0s.yml rename to locations/k12-h3-v0s.yml index 164d118bb..f846a406e 100644 --- a/locations/k12-3v0s.yml +++ b/locations/k12-h3-v0s.yml @@ -1,6 +1,6 @@ --- -location: k12-3v0s -location_nice: 'Haus4, Kastanienallee 12, 10435 Berlin' +location: k12-h3-v0s +location_nice: 'Haus3, Kastanienallee 12, 10435 Berlin' latitude: 52.53935393039 longitude: 13.40930967973 contact_nickname: 'zander' @@ -8,7 +8,7 @@ contacts: - 'alexanderjabs@gmx.de' hosts: - - hostname: k12-3v0s + - hostname: k12-h3-v0s role: corerouter model: "dlink_covr-x1860-a1" mac_override: {eth0: a8:63:7d:b9:46:45} @@ -29,23 +29,23 @@ networks: # MESH - 5 GHz 802.11s - vid: 20 role: mesh - name: mesh_5g + name: mesh_core_5g prefix: 10.31.227.144/32 ipv6_subprefix: -20 - mesh_ap: k12-3v0s + mesh_ap: k12-h3-v0s mesh_radio: 11a_standard mesh_iface: mesh # MESH - 2.4 GHz 802.11s - vid: 21 role: mesh - name: mesh_2g + name: mesh_core_2g prefix: 10.31.227.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: k12-3v0s + mesh_ap: k12-h3-v0s mesh_radio: 11g_standard mesh_iface: mesh @@ -59,7 +59,7 @@ networks: prefix: 10.31.227.160/27 ipv6_subprefix: 0 assignments: - k12-3v0s: 1 + k12-h3-v0s: 1 # MGMT - vid: 42 @@ -69,15 +69,15 @@ networks: dns: 1 ipv6_subprefix: 1 assignments: - k12-3v0s: 1 # 10.31.227.129 + k12-h3-v0s: 1 # 10.31.227.129 # AP-id, wifi-channel, bandwidth, txpower location__channel_assignments_11a_standard__to_merge: - k12-3v0s: 36-40 + k12-h3-v0s: 36-40 # AP-id, wifi-channel, bandwidth, txpower location__channel_assignments_11g_standard__to_merge: - k12-3v0s: 13-20 + k12-h3-v0s: 13-20 dns_servers: # quad9 diff --git a/locations/k12-h3-v2s.yml b/locations/k12-h3-v2s.yml new file mode 100644 index 000000000..6d1c50b09 --- /dev/null +++ b/locations/k12-h3-v2s.yml @@ -0,0 +1,90 @@ +--- +location: k12-h3-v2s +location_nice: 'Haus3, Kastanienallee 12, 10435 Berlin' +latitude: 52.539382528 +longitude: 13.409425020 +contact_nickname: 'zander' +contacts: + - 'alexanderjabs@gmx.de' + +hosts: + - hostname: k12-h3-v2s + role: corerouter + model: "dlink_covr-x1860-a1" + mac_override: {eth0: a8:63:7d:db:4d:3e} + wireless_profile: freifunk_default + +ipv6_prefix: '2001:bf7:760:2d00::/56' + +# got following prefixes: +# Router: 10.248.19.128/26 +# --MGMT: 10.248.19.128/28 +# --MESH: 10.248.19.144/28 +# --DHCP: 10.248.19.160/27 + +# Disable noping +dhcp_no_ping: false + +networks: + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_core_5g + prefix: 10.248.19.144/32 + ipv6_subprefix: -20 + mesh_ap: k12-h3-v2s + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_core_2g + prefix: 10.248.19.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: k12-h3-v2s + mesh_radio: 11g_standard + mesh_iface: mesh + + # DHCP with filtering and isolation + - vid: 40 + role: dhcp + inbound_filtering: true + enforce_client_isolation: true + prefix: 10.248.19.160/27 + ipv6_subprefix: 0 + assignments: + k12-h3-v2s: 1 + + # MGMT + - vid: 42 + role: mgmt + prefix: 10.248.19.128/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + k12-h3-v2s: 1 # 10.248.19.129 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + k12-h3-v2s: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + k12-h3-v2s: 13-20 + +dns_servers: + # quad9 + - 9.9.9.9 + - 149.112.112.112 + - 2620:fe::fe + - 2620:fe::9 + # cloudflare + - 1.1.1.1 + - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 diff --git a/locations/k12-h3.yml b/locations/k12-h3.yml new file mode 100644 index 000000000..107049022 --- /dev/null +++ b/locations/k12-h3.yml @@ -0,0 +1,149 @@ +--- +location: k12-h3 +location_nice: 'Haus 3, Kastanienallee 12, 10435 Berlin' +latitude: 52.53951094884286 +longitude: 13.409447813490967 +contact_nickname: 'zander' +contacts: + - 'alexanderjabs@gmx.de' + +hosts: + - hostname: k12-h3-core + role: corerouter + model: "dlink_dap-x1860-a1" + wireless_profile: freifunk_default + - hostname: k12-h3-h3n + role: ap + model: "dlink_dap-x1860-a1" + # - hostname: k12-h3-v2s + # role: ap + # model: "dlink_dap-x1860-a1" + # wireless_profile: freifunk_owe + +ipv6_prefix: '2001:bf7:760:700::/56' + +# got following prefixes: +# Router: 10.31.226.192/26 +# --MGMT: 10.31.226.192/28 +# --MESH: 10.31.226.208/28 +# --DHCP: 10.31.226.224/27 + +# Disable noping +dhcp_no_ping: false + +networks: + # MESH - 5 GHz 802.11s + - vid: 20 + role: mesh + name: mesh_core_5g + prefix: 10.31.226.209/32 + ipv6_subprefix: -20 + mesh_ap: k12-h3-core + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 21 + role: mesh + name: mesh_core_2g + prefix: 10.31.226.210/32 + ipv6_subprefix: -21 + # make mesh_metric(s) for 2GHz worse than 5GHz + mesh_metric: 1024 + mesh_metric_lqm: ['default 0.8'] + mesh_ap: k12-h3-core + mesh_radio: 11g_standard + mesh_iface: mesh + + # MESH - 5 GHz 802.11s + - vid: 22 + role: mesh + name: mesh_h3n_5g + prefix: 10.31.226.211/32 + ipv6_subprefix: -22 + mesh_ap: k12-h3-h3n + mesh_radio: 11a_standard + mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + - vid: 23 + role: mesh + name: mesh_h3n_2g + prefix: 10.31.226.212/32 + ipv6_subprefix: -23 + # make mesh_metric(s) for 2GHz worse than 5GHz + mesh_metric: 1024 + mesh_metric_lqm: ['default 0.8'] + mesh_ap: k12-h3-h3n + mesh_radio: 11g_standard + mesh_iface: mesh + + # MESH - 5 GHz 802.11s + # - vid: 24 + # role: mesh + # name: mesh_v2s_5g + # prefix: 10.31.226.213/32 + # ipv6_subprefix: -24 + # mesh_ap: k12-h3-v2s + # mesh_radio: 11a_standard + # mesh_iface: mesh + + # MESH - 2.4 GHz 802.11s + # - vid: 25 + # role: mesh + # name: mesh_v2s_2g + # prefix: 10.31.226.214/32 + # ipv6_subprefix: -25 + # # make mesh_metric(s) for 2GHz worse than 5GHz + # mesh_metric: 1024 + # mesh_metric_lqm: ['default 0.8'] + # mesh_ap: k12-h3-v2s + # mesh_radio: 11g_standard + # mesh_iface: mesh + + # DHCP with filtering and isolation + - vid: 40 + role: dhcp + inbound_filtering: true + enforce_client_isolation: true + prefix: 10.31.226.224/27 + ipv6_subprefix: 0 + assignments: + k12-h3-core: 1 + + # MGMT + - vid: 42 + role: mgmt + untagged: true + prefix: 10.31.226.192/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + k12-h3-core: 1 # 10.31.226.193 + k12-h3-h3n: 2 # 10.31.226.194 + # k12-h3-v2s: 2 # 10.31.226.195 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11a_standard__to_merge: + k12-h3-core: 44-40 + k12-h3-h3n: 36-40 + # k12-h3-v2s: 36-40 + +# AP-id, wifi-channel, bandwidth, txpower +location__channel_assignments_11g_standard__to_merge: + k12-h3-core: 13-20 + k12-h3-h3n: 13-20 + # k12-h3-v2s: 13-20 + +dns_servers: + # quad9 + - 9.9.9.9 + - 149.112.112.112 + - 2620:fe::fe + - 2620:fe::9 + # cloudflare + - 1.1.1.1 + - 1.0.0.1 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 diff --git a/locations/k12-haus4.yml b/locations/k12-h4.yml similarity index 77% rename from locations/k12-haus4.yml rename to locations/k12-h4.yml index 37dc6a060..a98f564b6 100644 --- a/locations/k12-haus4.yml +++ b/locations/k12-h4.yml @@ -1,5 +1,5 @@ --- -location: k12-haus4 +location: k12-h4 location_nice: 'Haus 4, Kastanienallee 12, 10435 Berlin' latitude: 52.53949585878101 longitude: 13.40898110911928 @@ -8,18 +8,18 @@ contacts: - 'alexanderjabs@gmx.de' hosts: - - hostname: k12-haus4-core + - hostname: k12-h4-core role: corerouter model: "dlink_covr-x1860-a1" - wireless_profile: freifunk_default mac_override: {eth0: 0c:0e:76:cf:21:e5} + wireless_profile: freifunk_default wifi_roaming: true - - hostname: k12-haus4-garten + - hostname: k12-h4-h0s role: ap model: "dlink_covr-x1860-a1" mac_override: {eth0: a8:63:7d:db:4d:53} wifi_roaming: true - - hostname: k12-haus4-hirschhof + - hostname: k12-h4-hirschhof role: ap model: "tplink_cpe210-v1" wifi_roaming: true @@ -36,23 +36,24 @@ networks: # MESH - 5 GHz 802.11s - vid: 20 role: mesh - name: mesh_5ghz + name: mesh_core_5g prefix: 10.31.157.160/32 ipv6_subprefix: -20 - mesh_ap: k12-haus4-core + mesh_ap: k12-h4-core mesh_radio: 11a_standard mesh_iface: mesh # MESH - 2.4 GHz 802.11s - vid: 21 role: mesh - name: mesh_2ghz + name: mesh_core_2g prefix: 10.31.157.161/32 ipv6_subprefix: -21 # make mesh_metric(s) for 2GHz worse than 5GHz - mesh_metric: 1024 + # prevent babel from using 2GHz link to segen + mesh_metric: 8192 mesh_metric_lqm: ['default 0.8'] - mesh_ap: k12-haus4-core + mesh_ap: k12-h4-core mesh_radio: 11g_standard mesh_iface: mesh @@ -62,43 +63,42 @@ networks: name: mesh_hirsch prefix: 10.31.157.162/32 ipv6_subprefix: -22 - mesh_ap: k12-haus4-hirschhof + mesh_ap: k12-h4-hirschhof mesh_radio: 11g_standard mesh_iface: mesh # MESH - 5 GHz 802.11s - Garten - vid: 23 role: mesh - name: mesh_11s_g5 + name: mesh_h0s_5g prefix: 10.31.157.163/32 ipv6_subprefix: -23 - mesh_ap: k12-haus4-garten + mesh_ap: k12-h4-h0s mesh_radio: 11a_standard mesh_iface: mesh # MESH - 2.4 GHz 802.11s - Garten - vid: 24 role: mesh - name: mesh_11s_g2 + name: mesh_h0s_2g prefix: 10.31.157.164/32 ipv6_subprefix: -24 # make mesh_metric(s) for 2GHz worse than 5GHz mesh_metric: 1024 mesh_metric_lqm: ['default 0.8'] - mesh_ap: k12-haus4-garten + mesh_ap: k12-h4-h0s mesh_radio: 11g_standard mesh_iface: mesh # DHCP - vid: 40 role: dhcp - untagged: true inbound_filtering: true enforce_client_isolation: true prefix: 10.31.157.128/27 ipv6_subprefix: 0 assignments: - k12-haus4-core: 1 + k12-h4-core: 1 # MGMT - vid: 42 @@ -108,19 +108,19 @@ networks: dns: 1 ipv6_subprefix: 1 assignments: - k12-haus4-core: 1 # 10.31.157.177 - k12-haus4-hirschhof: 2 # 10.31.157.178 - k12-haus4-garten: 3 # 10.31.157.179 + k12-h4-core: 1 # 10.31.157.177 + k12-h4-hirschhof: 2 # 10.31.157.178 + k12-h4-h0s: 3 # 10.31.157.179 # AP-id, wifi-channel, bandwidth, txpower location__channel_assignments_11a_standard__to_merge: - k12-haus4-core: 44-40 - k12-haus4-garten: 36-40 + k12-h4-core: 44-40 + k12-h4-h0s: 36-40 location__channel_assignments_11g_standard__to_merge: - k12-haus4-core: 13-20 - k12-haus4-garten: 13-20 - k12-haus4-hirschhof: 13-20 + k12-h4-core: 13-20 + k12-h4-h0s: 13-20 + k12-h4-hirschhof: 13-20 dns_servers: # quad9 diff --git a/locations/k12.yml b/locations/k12.yml deleted file mode 100644 index cce25c782..000000000 --- a/locations/k12.yml +++ /dev/null @@ -1,266 +0,0 @@ ---- -location: k12 -location_nice: 'Haus2, Kastanienallee 12, 10435 Berlin' -latitude: 52.53936534993554 -longitude: 13.409738833169316 -altitude: 63 -contact_nickname: 'zander' -contacts: - - 'alexanderjabs@gmx.de' - -hosts: - - hostname: k12-core - role: corerouter - model: "dlink_covr-x1860-a1" - mac_override: {eth0: a8:63:7d:db:4d:45} - wireless_profile: freifunk_default - wifi_roaming: true - - hostname: k12-cpe - role: ap - model: "mikrotik_sxtsq-5-ac" - mac_override: {eth0: 08:55:31:ea:e3:32} - wifi_roaming: true - - hostname: k12-ap1 - role: ap - model: "tplink_archer-c5-v1" - wifi_roaming: true - - hostname: k12-ap2 - role: ap - model: "tplink_archer-c7-v5" - wifi_roaming: true - - hostname: k12-2h1s - role: ap - model: "dlink_covr-x1860-a1" - mac_override: {eth0: 0c:0e:76:cf:21:de} - wifi_roaming: true - - hostname: k12-ap3 - role: ap - model: "tplink_tl-wdr4300-v1" - wifi_roaming: true - - hostname: k12-ap4 - role: ap - model: "tplink_archer-c5-v1" - wifi_roaming: true - -snmp_devices: - - hostname: k12-segen - address: 10.31.158.194 - snmp_profile: airos_8 - -ipv6_prefix: '2001:bf7:760:2a00::/56' - -# got following prefixes: -# Router: 10.31.158.0/24 -# --DHCP: 10.31.158.0/25 -# --MESH: 10.31.158.128/26 -# --MGMT: 10.31.158.192/27 -# --UPLK: 10.31.158.224/27 - -networks: - # MESH - segen - - vid: 11 - role: mesh - name: mesh_segen - prefix: 10.31.158.133/32 - ipv6_subprefix: -11 - - # MESH - 5 GHz 802.11s - - vid: 20 - role: mesh - name: mesh_5ghz - prefix: 10.31.158.128/32 - ipv6_subprefix: -20 - mesh_ap: k12-core - mesh_radio: 11a_standard - mesh_iface: mesh - - # MESH - 2.4 GHz 802.11s - - vid: 21 - role: mesh - name: mesh_2ghz - prefix: 10.31.158.129/32 - ipv6_subprefix: -21 - # make mesh_metric(s) for 2GHz worse than 5GHz - mesh_metric: 1024 - mesh_metric_lqm: ['default 0.8'] - mesh_ap: k12-core - mesh_radio: 11g_standard - mesh_iface: mesh - - # MESH - 5 GHz 802.11s - ap1 - - vid: 22 - role: mesh - name: mesh_ap1_5 - prefix: 10.31.158.130/32 - ipv6_subprefix: -22 - mesh_ap: k12-ap1 - mesh_radio: 11a_standard - mesh_iface: mesh - - # MESH - 2.4 GHz 802.11s - ap1 - - vid: 23 - role: mesh - name: mesh_ap1_2 - prefix: 10.31.158.131/32 - ipv6_subprefix: -23 - # make mesh_metric(s) for 2GHz worse than 5GHz - mesh_metric: 1024 - mesh_metric_lqm: ['default 0.8'] - mesh_ap: k12-ap1 - mesh_radio: 11g_standard - mesh_iface: mesh - - # MESH - 5 GHz 802.11s - cpe - - vid: 24 - role: mesh - name: mesh_cpe - prefix: 10.31.158.132/32 - ipv6_subprefix: -24 - mesh_ap: k12-cpe - mesh_radio: 11a_standard - mesh_iface: mesh - - # MESH - 5 GHz 802.11s - ap2 - - vid: 25 - role: mesh - name: mesh_ap2_5 - prefix: 10.31.158.134/32 - ipv6_subprefix: -25 - mesh_ap: k12-ap2 - mesh_radio: 11a_standard - mesh_iface: mesh - - # MESH - 2.4 GHz 802.11s - ap2 - - vid: 26 - role: mesh - name: mesh_ap2_2 - prefix: 10.31.158.135/32 - ipv6_subprefix: -26 - # make mesh_metric(s) for 2GHz worse than 5GHz - mesh_metric: 1024 - mesh_metric_lqm: ['default 0.8'] - mesh_ap: k12-ap2 - mesh_radio: 11g_standard - mesh_iface: mesh - - # MESH - 5 GHz 802.11s - ap4 - - vid: 27 - role: mesh - name: mesh_ap4_5 - prefix: 10.31.158.136/32 - ipv6_subprefix: -27 - mesh_ap: k12-ap4 - mesh_radio: 11a_standard - mesh_iface: mesh - - # MESH - 2.4 GHz 802.11s - ap4 - - vid: 28 - role: mesh - name: mesh_ap4_2 - prefix: 10.31.158.137/32 - ipv6_subprefix: -28 - # make mesh_metric(s) for 2GHz worse than 5GHz - mesh_metric: 1024 - mesh_metric_lqm: ['default 0.8'] - mesh_ap: k12-ap4 - mesh_radio: 11g_standard - mesh_iface: mesh - - # MESH - 5 GHz 802.11s - 2h1s - - vid: 29 - role: mesh - name: mesh_2h1s_5 - prefix: 10.31.158.138/32 - ipv6_subprefix: -29 - mesh_ap: k12-2h1s - mesh_radio: 11a_standard - mesh_iface: mesh - - # MESH - 2.4 GHz 802.11s - 2h1s - - vid: 30 - role: mesh - name: mesh_2h1s_2 - prefix: 10.31.158.139/32 - ipv6_subprefix: -30 - # make mesh_metric(s) for 2GHz worse than 5GHz - mesh_metric: 1024 - mesh_metric_lqm: ['default 0.8'] - mesh_ap: k12-2h1s - mesh_radio: 11g_standard - mesh_iface: mesh - - # DHCP - - vid: 40 - role: dhcp - untagged: true - inbound_filtering: true - enforce_client_isolation: true - prefix: 10.31.158.0/25 - ipv6_subprefix: 0 - assignments: - k12-core: 1 - - # MGMT - - vid: 42 - role: mgmt - prefix: 10.31.158.192/26 - gateway: 1 - dns: 1 - ipv6_subprefix: 1 - assignments: - k12-core: 1 # 10.31.158.193/32 - k12-segen: 2 # 10.31.158.194/32 - k12-ap1: 3 # 10.31.158.195/32 - k12-cpe: 4 # 10.31.158.196/32 - k12-ap2: 5 # 10.31.158.197/32 - k12-ap3: 6 # 10.31.158.198/32 - k12-ap4: 7 # 10.31.158.199/32 - k12-switch: 8 # 10.31.158.200/32 - k12-2h1s: 9 # 10.31.158.201/32 - - # UPLK - - vid: 50 - role: uplink - - - role: tunnel - ifname: ts_wg0 - mtu: 1280 - prefix: 10.31.158.224/32 - wireguard_port: 51820 - - - role: tunnel - ifname: ts_wg1 - mtu: 1280 - prefix: 10.31.158.225/32 - wireguard_port: 51821 - -# AP-id, wifi-channel, bandwidth, txpower -location__channel_assignments_11a_standard__to_merge: - k12-core: 36-40 - k12-ap1: 36-40 - k12-ap2: 36-40 - k12-ap3: 48-40 - k12-ap4: 36-40 - k12-cpe: 44-40 - k12-2h1s: 36-40 - -# AP-id, wifi-channel, bandwidth, txpower -location__channel_assignments_11g_standard__to_merge: - k12-core: 13-20 - k12-ap1: 13-20 - k12-ap2: 13-20 - k12-ap3: 1-20 - k12-ap4: 13-20 - k12-2h1s: 13-20 - -dns_servers: - # quad9 - - 9.9.9.9 - - 149.112.112.112 - - 2620:fe::fe - - 2620:fe::9 - # cloudflare - - 1.1.1.1 - - 1.0.0.1 - - 2606:4700:4700::1111 - - 2606:4700:4700::1001