Merge branch 'master' into muggel

group_vars/location_liese_21/networks.yml

@@ -21,7 +21,7 @@ networks:
 
   - vid: 20
     role: mesh
-    name: mesh_n_nf_5ghz
+    name: n_nf_5ghz
     prefix: '10.31.174.10/32'
     ipv6_subprefix: -20
     mesh_ap: liese-21-n-nf-5ghz

group_vars/location_wuhli/networks.yml

@@ -22,7 +22,7 @@ networks:
     name: mesh_n_5g
     prefix: 10.31.112.24/32
     ipv6_subprefix: -1
-    mesh_ap: wuhli-n-nf-5g
+    mesh_ap: wuhli-n-nf-5ghz
     mesh_radio: 11a_standard
     mesh_iface: mesh
 
@@ -31,7 +31,7 @@ networks:
     name: mesh_o_5g
     prefix: 10.31.112.25/32
     ipv6_subprefix: -2
-    mesh_ap: wuhli-o-nf-5g
+    mesh_ap: wuhli-o-nf-5ghz
     mesh_radio: 11a_standard
     mesh_iface: mesh
 
@@ -40,7 +40,7 @@ networks:
     name: mesh_s_5g
     prefix: 10.31.112.26/32
     ipv6_subprefix: -3
-    mesh_ap: wuhli-s-nf-5g
+    mesh_ap: wuhli-s-nf-5ghz
     mesh_radio: 11a_standard
     mesh_iface: mesh
 
@@ -49,7 +49,7 @@ networks:
     name: mesh_w_5g
     prefix: 10.31.112.27/32
     ipv6_subprefix: -4
-    mesh_ap: wuhli-w-nf-5g
+    mesh_ap: wuhli-w-nf-5ghz
     mesh_radio: 11a_standard
     mesh_iface: mesh
 
@@ -79,7 +79,7 @@ networks:
       wuhli-w-nf-5ghz: 11
 
 location__channel_assignments_11a_standard__to_merge:
-  wuhli-n-nf-5g: 36-20
-  wuhli-o-nf-5g: 40-20
-  wuhli-s-nf-5g: 44-20
-  wuhli-w-nf-5g: 48-20
+  wuhli-n-nf-5ghz: 48-20
+  wuhli-o-nf-5ghz: 40-20
+  wuhli-s-nf-5ghz: 44-20
+  wuhli-w-nf-5ghz: 36-20

group_vars/location_wuhlipunks/general.yml

@@ -0,0 +1,2 @@
+---
+community: true

group_vars/location_wuhlipunks/networks.yml

@@ -0,0 +1,40 @@
+---
+ipv6_prefix: "2001:bf7:840:b00::/56"
+
+# Wuhlipunks got following prefixes:
+# Router: 10.31.173.128/26
+# --MGMT: 10.31.173.128/28
+# --MESH: 10.31.173.144/28
+# --DHCP: 10.31.173.160/27
+
+networks:
+  - vid: 40
+    role: dhcp
+    inbound_filtering: true
+    enforce_client_isolation: true
+    prefix: 10.31.173.160/27
+    ipv6_subprefix: 0
+    assignments:
+      wuhlipunks-core: 1
+
+  - vid: 20
+    role: mesh
+    name: mesh_n_5g
+    prefix: 10.31.173.144/32
+    ipv6_subprefix: -1
+    mesh_ap: wuhlipunks-mesh
+    mesh_radio: 11a_standard
+    mesh_iface: mesh
+
+  - vid: 42
+    role: mgmt
+    prefix: 10.31.173.128/28
+    gateway: 1
+    dns: 1
+    ipv6_subprefix: 1
+    assignments:
+      wuhlipunks-core: 1
+      wuhlipunks-mesh: 2
+
+location__channel_assignments_11a_standard__to_merge:
+  wuhlipunks-mesh: 48-20

group_vars/location_wuhlipunks/owm.yml

@@ -0,0 +1,4 @@
+---
+location_nice: Wuhlheide
+latitude: 52.466118
+longitude: 13.537581

group_vars/model_dlink_dap_x1860_a1.yml

@@ -1,8 +1,8 @@
 ---
 target: ramips/mt7621
+openwrt_version: snapshot
 
-dsa_ports:
-  - lan
+int_port: lan
 
 wireless_devices:
   - name: 11a_standard

group_vars/model_netgear_wax202.yml

@@ -1,5 +1,6 @@
 ---
 target: ramips/mt7621
+openwrt_version: snapshot
 
 dsa_ports:
   - wan

group_vars/model_ubnt_edgerouter_4.yml

@@ -1,6 +1,5 @@
 ---
 target: octeon/generic
-openwrt_version: 22.03-SNAPSHOT
 
 target__packages__to_merge:
   - naywatch

group_vars/model_ubnt_powerbeam_m5_xw.yml

@@ -0,0 +1,14 @@
+---
+target: ath79/generic
+
+int_port: eth0
+
+low_mem: true
+
+wireless_devices:
+  - name: 11a_standard
+    band: 5g
+    htmode_prefix: HT
+    path: platform/ahb/18100000.wmac
+    ifname_hint: wlan5
+    antenna_gain: 12

group_vars/model_zyxel_nwa55axe.yml

@@ -1,8 +1,8 @@
 ---
 target: ramips/mt7621
+openwrt_version: snapshot
 
-dsa_ports:
-  - lan
+int_port: lan
 
 wireless_devices:
   - name: 11a_standard

group_vars/role_gateway/general.yml

@@ -80,8 +80,6 @@ inbound_allow:
     dst: 2001:bf7:830:9d00::/128
     proto: tcp
     dst_port: 22
-  - name: 'e16host'
-    dst: 2001:bf7:760:2532::/64
   - name: 'prometheus-poc'
     proto: tcp
     src: 2a04:d480:2c02:b::/64

host_vars/wuhlipunks-core/base.yml

@@ -0,0 +1,7 @@
+---
+
+location: wuhlipunks
+role: corerouter
+model: "avm_fritzbox-7530"
+
+wireless_profile: freifunk_default

host_vars/wuhlipunks-mesh/base.yml

@@ -0,0 +1,7 @@
+---
+
+location: wuhlipunks
+role: ap
+model: "ubnt_powerbeam-m5-xw"
+
+wireless_profile: mesh_only

locations/parzelle17-fritz.yml

@@ -0,0 +1,80 @@
+---
+location: parzelle17
+location_nice: Parzelle 17
+latitude: 52.478675
+longitude: 13.471268
+community: true
+
+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: parzelle17-fritz-core
+    role: corerouter
+    model: "avm_fritzbox-7530"
+    wireless_profile: freifunk_default
+    openwrt_version: snapshot
+
+ipv6_prefix: '2001:bf7:840:1000::/56'
+
+# config restored from router configuration
+# got following prefixes:
+# Router: 10.31.207.64/26
+# --MGMT: 10.31.207.80/28
+# --MESH: 10.31.207.64/28
+# --DHCP: 10.31.207.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.31.207.96/27
+    ipv6_subprefix: 0
+    assignments:
+      parzelle17-fritz-core: 1
+
+  # MESH - 5 GHz 802.11s
+  - vid: 20
+    role: mesh
+    name: mesh_5g
+    prefix: 10.31.207.64/32
+    ipv6_subprefix: -20
+    mesh_ap: parzelle17-fritz-core
+    mesh_radio: 11a_standard
+    mesh_iface: mesh
+
+  # MESH - 2.4 GHz 802.11s
+  - vid: 21
+    role: mesh
+    name: mesh_2g
+    prefix: 10.31.207.65/32
+    ipv6_subprefix: -21
+    mesh_ap: parzelle17-fritz-core
+    mesh_radio: 11g_standard
+    mesh_iface: mesh
+
+  # MGMT
+  - vid: 42
+    role: mgmt
+    prefix: 10.31.207.80/28
+    gateway: 1
+    dns: 1
+    ipv6_subprefix: 1
+    assignments:
+      # 10.31.207.81/32
+      parzelle17-fritz-core: 1

locations/parzelle17.yml

@@ -0,0 +1,79 @@
+---
+location: parzelle17
+location_nice: Parzelle 17
+latitude: 52.478675
+longitude: 13.471268
+community: true
+
+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: parzelle17-core
+    role: corerouter
+    model: "dlink_dap-x1860-a1"
+    wireless_profile: freifunk_default
+
+ipv6_prefix: '2001:bf7:840:f00::/56'
+
+# config restored from router configuration
+# got following prefixes:
+# Router: 10.31.207.0/26
+# --MGMT: 10.31.207.0/28
+# --MESH: 10.31.207.16/28
+# --DHCP: 10.31.207.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.31.207.32/27
+    ipv6_subprefix: 0
+    assignments:
+      parzelle17-core: 1
+
+  # MESH - 5 GHz 802.11s
+  - vid: 20
+    role: mesh
+    name: mesh_5g
+    prefix: 10.31.207.16/32
+    ipv6_subprefix: -20
+    mesh_ap: parzelle17-core
+    mesh_radio: 11a_standard
+    mesh_iface: mesh
+
+  # MESH - 2.4 GHz 802.11s
+  - vid: 21
+    role: mesh
+    name: mesh_2g
+    prefix: 10.31.207.17/32
+    ipv6_subprefix: -21
+    mesh_ap: parzelle17-core
+    mesh_radio: 11g_standard
+    mesh_iface: mesh
+
+  # MGMT
+  - vid: 42
+    role: mgmt
+    prefix: 10.31.207.0/28
+    gateway: 1
+    dns: 1
+    ipv6_subprefix: 1
+    assignments:
+      # 10.31.207.1/32
+      parzelle17-core: 1

roles/cfg_openwrt/templates/common/wikiupdater.j2

@@ -39,14 +39,14 @@
     {% set contacts_output = [] %}
     {% for contact in contacts %}
         {% if (contact | regex_search('^#.*\:.*\..*')) %}
-            {% do contacts_output.append('https://matrix.to/'+contact) %}
+            {% do contacts_output.append('https://matrix.to/#/'+contact) %}
         {% else %}
             {% do contacts_output.append(contact) %}
         {% endif %}
     {% endfor %}
     {% do wi.ki.update({'Ansprechpartner Kontakt': contacts_output})%}
 {% else %}
-    {% do wi.ki.update({'Ansprechpartner Kontakt': 'info'+location+'@berlin.freifunk.net'})%}
+    {% do wi.ki.update({'Ansprechpartner Kontakt': 'info+'+location+'@berlin.freifunk.net'})%}
 {% endif %}
 
 {# Processing vars from network.yml #}

roles/cfg_openwrt/templates/corerouter/config/dhcp.j2

@@ -41,7 +41,7 @@ config dhcp 'dhcp_{{ name }}'
 	option leasetime '5m'
 	option start '2'
 	option limit '{{ network['prefix'] | ansible.utils.ipaddr('size') -3 }}'
-        list dhcp_option '121,0.0.0.0/0,{{ network['prefix'] | ansible.utils.ipaddr(network['assignments'][inventory_hostname]) | ansible.utils.ipaddr('address') }},10.31.0.0/16,{{ network['prefix'] | ansible.utils.ipaddr(network['assignments'][inventory_hostname]) | ansible.utils.ipaddr('address') }},10.36.0.0/16,{{ network['prefix'] | ansible.utils.ipaddr(network['assignments'][inventory_hostname]) | ansible.utils.ipaddr('address') }},10.230.0.0/16,{{ network['prefix'] | ansible.utils.ipaddr(network['assignments'][inventory_hostname]) | ansible.utils.ipaddr('address') }}'
+        list dhcp_option '121,0.0.0.0/0,{{ network['prefix'] | ansible.utils.ipaddr(network['assignments'][inventory_hostname]) | ansible.utils.ipaddr('address') }},10.31.0.0/16,{{ network['prefix'] | ansible.utils.ipaddr(network['assignments'][inventory_hostname]) | ansible.utils.ipaddr('address') }},10.36.0.0/16,{{ network['prefix'] | ansible.utils.ipaddr(network['assignments'][inventory_hostname]) | ansible.utils.ipaddr('address') }},10.230.0.0/16,{{ network['prefix'] | ansible.utils.ipaddr(network['assignments'][inventory_hostname]) | ansible.utils.ipaddr('address') }},10.248.0.0/14,{{ network['prefix'] | ansible.utils.ipaddr(network['assignments'][inventory_hostname]) | ansible.utils.ipaddr('address') }}'
     {% else %}
 	option dhcpv4 'disabled'
     {% endif %}