From 75b05e803123851bcd5d9eefdb69f31e19746732 Mon Sep 17 00:00:00 2001 From: nailend Date: Wed, 20 Nov 2024 13:55:09 +0100 Subject: [PATCH 01/10] Add AP model aruba_ap_303 --- group_vars/model_aruba_ap_303.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 group_vars/model_aruba_ap_303.yml diff --git a/group_vars/model_aruba_ap_303.yml b/group_vars/model_aruba_ap_303.yml new file mode 100644 index 00000000..f1442d5d --- /dev/null +++ b/group_vars/model_aruba_ap_303.yml @@ -0,0 +1,19 @@ +--- +target: ipq40xx/generic +brand_nice: Aruba +model_nice: Instant On AP11 + +dsa_ports: + - lan + +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 e92fdbaec80a4e4a5a55575d35fb7a6a0be6a83b Mon Sep 17 00:00:00 2001 From: nailend Date: Wed, 20 Nov 2024 13:55:42 +0100 Subject: [PATCH 02/10] Add new hosts to location k9 --- locations/k9.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/locations/k9.yml b/locations/k9.yml index 5026aabf..73ffebad 100644 --- a/locations/k9.yml +++ b/locations/k9.yml @@ -13,6 +13,14 @@ hosts: role: corerouter model: "avm_fritzbox-7530" wireless_profile: freifunk_default + - hostname: k9-nf-loge + role: ap + model: "aruba_ap-303" + wireless_profile: freifunk_default + - hostname: k9-nf-groessenwahn + role: ap + model: "aruba_ap-303" + wireless_profile: freifunk_default snmp_devices: - hostname: k9-sama From 5a611a86cca42641899ae2c6781aafc6730bdd72 Mon Sep 17 00:00:00 2001 From: nailend Date: Wed, 20 Nov 2024 13:56:42 +0100 Subject: [PATCH 03/10] Replace ssh-keys at k9 --- locations/k9.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locations/k9.yml b/locations/k9.yml index 73ffebad..4ea0eb6c 100644 --- a/locations/k9.yml +++ b/locations/k9.yml @@ -132,9 +132,9 @@ networks: k9-sama: 3 # 10.31.9.211 k9-zwingli: 4 # 10.31.9.212 k9-wilgu10: 5 # 10.31.9.213 + k9-nf-loge: 6 # 10.31.9.214 + k9-nf-groessenwahn: 7 # 10.31.9.215 location__ssh_keys__to_merge: - - comment: k9 JuergeN - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDQe6dpUP7ame5ndvnQpghI/OVWav52ggbgwbdZ56Tr1q0bZQzuHNzwgRUrMiOtNbeN6AYQtLF2kEn1v0fLGp1twYiCFbc5GZV7Do5aDyqK71gDo2b0/EQ0pc/AeXnt4XoEfW1k6USCvGgAwUsVRJgHd1b+1+rrfdFH4qF8JatUYbcNDhS/hf6pUwQFEUJ+OdCFMgxbNYScnvf3UR5ttBq+Ur6yiYq1qi7zupVne9RKrCZMqaq0pdQGx9t8TOF3dskN5EWqn0GDCNOZZmf1VC1KhfhngE3/SYCqOAxSSXIUpLehL1KI05xhWVSzt0ngRVzgxySBsDxdJw8go/scisDB99Pfh+cSsHylHWW4JUEaIaZpMIpqydYElnyuZffr02C4tqdht18bc0lom0YcknYJ+UeBkBpRa3ii+WiANGBcs5j5+tUlu3GlWDHWE/gBj/FSp1X/FOCg6vhYO7nMdQa59ZIps/Y1NFlmKB7jwX76dj5Z8M8ZRmofSlbC2D3PKaQdYrbtVGWRqbVBpE8w0hw4zraKs7mpq1EHLN7gcDmkFoxaqWi1mU30Y3m8eltzspycHbyotq+djKF3zxlA6zR1eAexG7e+BYknMKqHiXMwP+cF6Tmr0rpaAHbBqeO3gXk5AhtIGLGGvdyAitgfmlVG0xVcgz2FeTPu3/RCgtpSOQ== - - comment: k9 Silke - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkyugPN8XIgxZ/l9fRPbcXrR042/XzX4T7PGP49ffHEDF8O0thI4tiils8LDkSJGpOtwPd1BPPgTT3YDm0Biy+HaeTtEEmVUs7AmRjl5sPcUXwPwMUXl9DKHBzpYKAfb6Jy2pBos7eswtFLHAS2tziyhREMz8OJuh9qZ9fs32BG+6AEGFL1hs4evI+NFtokcW7HW28zhkq2+NWi1kKef0SRY0rX9Kfp6fkMc5XKCZPuWBz97ZMCvUKShBiZXVJj6QzNxjaBcVnMCB/oqLxfrs2FrUbvNDcb2bAamyYLCVaU0DKtefByuBhsrrRdD35Ahi+qh1FFC1X59j1ozZX7Xq/ + - comment: k9 iuljan + key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO0hqsAl0BJGlVgARU0KcE2JD+ljlOJebbFn4NI1aAlQ freifunk-k9@iujian-m3 From 4eb04a636878628a3a44e0fc4f8347efe714e786 Mon Sep 17 00:00:00 2001 From: Simon Polack Date: Wed, 20 Nov 2024 23:30:10 +0100 Subject: [PATCH 04/10] k9: overhaul 2024 --- locations/k9.yml | 73 +++++++++++++++--------------------------------- 1 file changed, 22 insertions(+), 51 deletions(-) diff --git a/locations/k9.yml b/locations/k9.yml index 5026aabf..342da165 100644 --- a/locations/k9.yml +++ b/locations/k9.yml @@ -35,7 +35,7 @@ ipv6_prefix: '2001:bf7:830:8d00::/56' # - 10.31.9.0/25 - DHCP # - 10.31.9.208/28 - MGMT # - 10.31.9.224/28 - BBB-Mesh -# - 10.31.9.240/28 - Internal Mesh +# - 10.31.9.240/28 - New MGMT # 10.31.99.0/24 / can be proably dismantled @@ -45,61 +45,16 @@ networks: role: mesh name: mesh_sama prefix: 10.31.9.224/32 - ipv6_subprefix: -10 - ptp: true + ipv6_subprefix: -1 # MESH - Zwingli - vid: 11 role: mesh name: mesh_zwingli prefix: 10.31.9.225/32 - ipv6_subprefix: -11 + ipv6_subprefix: -2 mesh_metric: 1024 mesh_metric_lqm: ['default 0.6'] - ptp: true - - # MESH - Wilgu10 - - vid: 12 - role: mesh - name: mesh_wilgu10 - prefix: 10.31.9.226/32 - ipv6_subprefix: -12 - ptp: true - - # MESH - LAN via Powerline - - vid: 20 - role: mesh - name: mesh_k9int - prefix: 10.31.9.240/28 - ipv6_subprefix: -20 - mesh_metric: 64 - mesh_metric_lqm: ['default 0.2'] - # Ignore Uplink one Hop away / requires 0.2 LQM - assignments: - k9-core: 1 - - # MESH - 5 GHz 802.11s - - vid: 21 - role: mesh - name: mesh_5g - prefix: 10.31.9.227/32 - ipv6_subprefix: -21 - mesh_ap: k9-core - mesh_radio: 11a_standard - mesh_iface: mesh - - # MESH - 2.4 GHz 802.11s - - vid: 22 - role: mesh - name: mesh_2g - prefix: 10.31.9.228/32 - ipv6_subprefix: -22 - # make mesh_metric(s) for 2GHz worse than 5GHz - mesh_metric: 1024 - mesh_metric_lqm: ['default 0.5'] - mesh_ap: k9-core - mesh_radio: 11g_standard - mesh_iface: mesh # DHCP - vid: 40 @@ -121,9 +76,25 @@ networks: assignments: k9-core: 1 # 10.31.9.209 # k9-switch: 2 # 10.31.9.210 - k9-sama: 3 # 10.31.9.211 - k9-zwingli: 4 # 10.31.9.212 - k9-wilgu10: 5 # 10.31.9.213 +# k9-sama: 3 # 10.31.9.211 +# k9-zwingli: 4 # 10.31.9.212 +# k9-wilgu10: 5 # 10.31.9.213 + + # New MGMT + - vid: 439 + role: mgmt + prefix: 10.31.9.240/28 + gateway: 1 + dns: 1 + ipv6_subprefix: 1 + assignments: + k9-core: 1 + k9-switch-roof: 2 # uisp-s + k9-sama: 3 # wave nano + k9-zwingli: 4 + k9-switch-house: 8 # hpe 2520g-poe + k9-ap-loge: 9 + k9-ap-hinterhaus: 10 location__ssh_keys__to_merge: - comment: k9 JuergeN From bbbe872ce0d505052322307996ac7ad43b945693 Mon Sep 17 00:00:00 2001 From: Simon Polack Date: Wed, 20 Nov 2024 23:35:18 +0100 Subject: [PATCH 05/10] fixup --- locations/k9.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locations/k9.yml b/locations/k9.yml index 342da165..17ff4b4a 100644 --- a/locations/k9.yml +++ b/locations/k9.yml @@ -46,6 +46,7 @@ networks: name: mesh_sama prefix: 10.31.9.224/32 ipv6_subprefix: -1 + mesh_metric: 128 # MESH - Zwingli - vid: 11 @@ -54,7 +55,7 @@ networks: prefix: 10.31.9.225/32 ipv6_subprefix: -2 mesh_metric: 1024 - mesh_metric_lqm: ['default 0.6'] + mesh_metric_lqm: ['default 0.5'] # DHCP - vid: 40 From bf6f5c8d994d39c26edfb9a77001bdc53b4f85ae Mon Sep 17 00:00:00 2001 From: Simon Polack Date: Thu, 21 Nov 2024 01:14:03 +0100 Subject: [PATCH 06/10] refresh --- locations/k9.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/locations/k9.yml b/locations/k9.yml index 17ff4b4a..92d9ef19 100644 --- a/locations/k9.yml +++ b/locations/k9.yml @@ -13,20 +13,22 @@ hosts: role: corerouter model: "avm_fritzbox-7530" wireless_profile: freifunk_default + - hostname: k9-ap-loge + role: ap + model: "TBD" + - hostname: k9-ap-hinterhaus + role: ap + model: "TBD" snmp_devices: - hostname: k9-sama - address: 10.31.9.211 - snmp_profile: airos_8 + address: 10.31.9.243 + snmp_profile: af60 - hostname: k9-zwingli - address: 10.31.9.212 + address: 10.31.9.244 snmp_profile: airos_6 - - hostname: k9-wilgu10 - address: 10.31.9.213 - snmp_profile: airos_8 - ipv6_prefix: '2001:bf7:830:8d00::/56' # K9 Prefixes: @@ -70,6 +72,7 @@ networks: # MGMT - vid: 42 role: mgmt + name: omgmt prefix: 10.31.9.208/28 gateway: 1 dns: 1 From 4a5675d773345e771cae3e6b42762539a3b2abd5 Mon Sep 17 00:00:00 2001 From: nailend Date: Thu, 21 Nov 2024 01:20:13 +0100 Subject: [PATCH 07/10] k9: update antenna hardware & orientation --- locations/k9.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locations/k9.yml b/locations/k9.yml index 4ea0eb6c..86152be3 100644 --- a/locations/k9.yml +++ b/locations/k9.yml @@ -25,15 +25,15 @@ hosts: snmp_devices: - hostname: k9-sama address: 10.31.9.211 - snmp_profile: airos_8 + snmp_profile: af60 - hostname: k9-zwingli address: 10.31.9.212 - snmp_profile: airos_6 + snmp_profile: airos_8 - - hostname: k9-wilgu10 + - hostname: k9-scharni address: 10.31.9.213 - snmp_profile: airos_8 + snmp_profile: airos_6 ipv6_prefix: '2001:bf7:830:8d00::/56' @@ -69,7 +69,7 @@ networks: # MESH - Wilgu10 - vid: 12 role: mesh - name: mesh_wilgu10 + name: mesh_scharni prefix: 10.31.9.226/32 ipv6_subprefix: -12 ptp: true @@ -131,7 +131,7 @@ networks: # k9-switch: 2 # 10.31.9.210 k9-sama: 3 # 10.31.9.211 k9-zwingli: 4 # 10.31.9.212 - k9-wilgu10: 5 # 10.31.9.213 + k9-scharni: 5 # 10.31.9.213 k9-nf-loge: 6 # 10.31.9.214 k9-nf-groessenwahn: 7 # 10.31.9.215 From 07f2c992dc88ce30d17a2ed43ac3e706b2bca129 Mon Sep 17 00:00:00 2001 From: nailend Date: Thu, 21 Nov 2024 01:55:55 +0100 Subject: [PATCH 08/10] k9: rename ap hosts --- locations/k9.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locations/k9.yml b/locations/k9.yml index 15b568d2..567150c5 100644 --- a/locations/k9.yml +++ b/locations/k9.yml @@ -13,11 +13,11 @@ hosts: role: corerouter model: "avm_fritzbox-7530" wireless_profile: freifunk_default - - hostname: k9-nf-loge + - hostname: k9-ap-loge role: ap model: "aruba_ap-303" wireless_profile: freifunk_default - - hostname: k9-nf-groessenwahn + - hostname: k9-ap-groessenwahn role: ap model: "aruba_ap-303" wireless_profile: freifunk_default @@ -89,8 +89,8 @@ networks: # k9-sama: 3 # 10.31.9.211 # k9-zwingli: 4 # 10.31.9.212 # k9-scharni: 5 # 10.31.9.213 -# k9-nf-loge: 6 # 10.31.9.214 -# k9-nf-groessenwahn: 7 # 10.31.9.215 +# k9-ap-loge: 6 # 10.31.9.214 +# k9-ap-groessenwahn: 7 # 10.31.9.215 # New MGMT - vid: 439 From fcb5aadaefc4e8c95629cecff907046b08a1f7c8 Mon Sep 17 00:00:00 2001 From: nailend Date: Thu, 21 Nov 2024 01:56:09 +0100 Subject: [PATCH 09/10] k9: fix shh-key --- locations/k9.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locations/k9.yml b/locations/k9.yml index 567150c5..d6cac5c0 100644 --- a/locations/k9.yml +++ b/locations/k9.yml @@ -110,4 +110,4 @@ networks: location__ssh_keys__to_merge: - comment: k9 iuljan - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO0hqsAl0BJGlVgARU0KcE2JD+ljlOJebbFn4NI1aAlQ freifunk-k9@iujian-m3 + key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO0hqsAl0BJGlVgARU0KcE2JD+ljlOJebbFn4NI1aAlQ freifunk-k9@iuljan-m3 From aa7f35eb0e4718de14e1a586d415dce086ccf0ee Mon Sep 17 00:00:00 2001 From: nailend Date: Thu, 21 Nov 2024 02:00:13 +0100 Subject: [PATCH 10/10] k9: add scharni --- locations/k9.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/locations/k9.yml b/locations/k9.yml index d6cac5c0..99de62dd 100644 --- a/locations/k9.yml +++ b/locations/k9.yml @@ -104,6 +104,7 @@ networks: k9-switch-roof: 2 # uisp-s k9-sama: 3 # wave nano k9-zwingli: 4 + k9-scharni: 5 k9-switch-house: 8 # hpe 2520g-poe k9-ap-loge: 9 k9-ap-hinterhaus: 10