update working config

Author: soupdiver

locations/liese-11-sw.yml

@@ -1,100 +1,110 @@
 ---
 
 location: liese-11-sw
-location_nice: Frankfurter Allee 218
-latitude: 52.511259
-longitude: 13.49598
-altitude: 50
-contact_nickname: "soupdiver"
+location_nice: Frankfurter Allee 218 E11
+latitude: 52.511075796
+longitude: 13.495362997
+height: 35
+contact_nickname: "void"
 contacts:
   - "[email protected]"
 
 hosts:
   - hostname: liese-11-sw-core
     role: corerouter
     model: x86_64
+    host__rclocal__to_merge:
+      - "ip route add 10.23.0.0/16 via 10.200.0.1"
+  
+  # Mesh
+  - hostname: liese-11-sw-ap-magda
+    role: ap
+    model: "ubnt_nanostation-ac-loco"
+    int_port: lan0
+  
+  - hostname: liese-11-sw-ap-tier
+    role: ap
+    model: "ubnt_nanobeam-ac-xc"
+    int_port: eth0
 
+  # DHCP
   - hostname: liese-11-sw-ap-fa
     role: ap
     model: "mikrotik_sxtsq-5-ac"
-    mac_override:
-      eth0: DC:2C:6E:C4:2D:11
-
-# snmp_devices:
-#   - hostname: liese-11-sw-ap-magda
-#     address: 10.31.205.50
-#     snmp_profile: airos_8
-
-  # - hostname: liese-21-n-5ghz
-  #   address: 10.31.137.51
-  #   snmp_profile: airos_8
 
-# airos_dfs_reset:
-#   - name: "liese-11-sw-ap-magda"
-#     target: "10.31.137.51"
-#     username: "ubnt"
-#     password: "file:/root/pwd"
-#     daytime_limit: "0-23"
-
-# mesh: 10.31.174.8/29
-# dhcp: 10.31.211.64/26
-# mgmt: 10.31.137.48/28
-
-ipv6_prefix: "2001:bf7:860:1500::/56"
+snmp_devices:
+  - hostname: liese-11-sw-ap-magda
+    address: 10.200.0.3
+    snmp_profile: airos_8
+  
+  - hostname: liese-11-sw-ap-tier
+    address: 10.200.0.4
+    snmp_profile: airos_8
+
+# mgmt: 10.200.0.0/24
+# mesh: 10.248.86.160/28
+# dhcp: 10.248.86.176/28
+
+airos_dfs_reset:
+  - name: "liese-11-sw-ap-magda"
+    target: "10.200.0.3"
+    username: "felix"
+    password: "file:/root/liese-11-sw-ap-magda.pass"
+    daytime_limit: "0-23"
+
+airos_dfs_reset:
+  - name: "liese-11-sw-ap-tier"
+    target: "10.200.0.4"
+    username: "freifunk"
+    password: "file:/root/liese-11-sw-ap-tier.pass"
+    daytime_limit: "0-23"
+
+ipv6_prefix: "2001:bf7:860:2b00::/56"
 
 networks:
   - vid: 10
     role: mesh
     name: mesh_magda
-    prefix: 10.31.205.49/27
-    # ipv6_subprefix: -10
+    mesh_ap: liese-11-sw-ap-magda
+    mesh_radio: 11a_standard
+    mesh_iface: mesh_magda
+    mesh_metric: 32
+    ptp: true
+    prefix: 10.248.86.161/32
+    ipv6_subprefix: -10
 
   - vid: 11
     role: mesh
     name: mesh_tierpark
-    prefix: 10.31.205.53/27
-    # ipv6_subprefix: -11
-
-  # - vid: 20
-  #   role: mesh
-  #   name: n_nf_5ghz
-  #   prefix: "10.31.174.10/32"
-  #   ipv6_subprefix: -20
-  #   mesh_ap: liese-21-n-nf-5ghz
-  #   mesh_radio: 11a_standard
-  #   mesh_iface: mesh
+    mesh_ap: liese-11-sw-ap-tier
+    mesh_radio: 11a_standard
+    mesh_iface: mesh_tierpark
+    mesh_metric: 64
+    ptp: true
+    prefix: 10.248.86.162/32
+    ipv6_subprefix: -11
 
   - vid: 40
     role: dhcp
-    prefix: 10.31.207.129/26
-    # ipv6_subprefix: 0
+    prefix: 10.248.86.176/28
+    ipv6_subprefix: 0
+    inbound_filtering: true
+    enforce_client_isolation: true
     inbound_filtering: true
     enforce_client_isolation: true
     assignments:
       liese-11-sw-core: 1
+      liese-11-sw-ap-fa: 2
 
   - vid: 42
     role: mgmt
-    prefix: 10.200.0.23/24
-    gateway: 1
-    dns: 1
-    # ipv6_subprefix: 1
+    prefix: 10.200.0.0/24
+    gateway: 2
+    dns: 2
+    ntp: 2
+    ipv6_subprefix: 1
     assignments:
-      liese-11-sw-core: 1
-      liese-11-sw-ap-magda: 2
-      # liese-21-n-5ghz: 3
-      # liese-21-n-nf-5ghz: 4
-
-# location__channel_assignments_11a_standard__to_merge:
-#   liese-21-n-nf-5ghz: 100-40
-# location__channel_assignments_11g_standard__to_merge:
-
-# channel-bandwith-txpower in dbm
-
-# PORT CONFIG
-#
-# lan1: poe in
-# lan2: Lite-AP
-# lan3: Nanobeam 5AC + SXTsq5ac
-# lan4: spare
-# lan5: spare
+      liese-11-sw-core: 2
+      liese-11-sw-ap-magda: 3
+      liese-11-sw-ap-tier: 4
+      liese-11-sw-ap-fa: 5