buildscript.sh

 #!/bin/bash
 
-GLUON_REMOTE_BRANCH="v2020.2.x"
+GLUON_REMOTE_BRANCH="v2021.1.x"
 
 # get location of executed file.
 EXECDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -20,11 +20,14 @@ help_print(){
 #  echo "    fastd               Prepare site repo for fastd build"
   echo "    l2tp                prepare site repo for l2tp build"
   echo "    BROKEN              y or n (default n)"
-  echo "  build <command>       <command> can be replaced by targets"
+  echo "  build <target>        targets provided by gluon"
   echo "    target_list         build all gluon targets"
   echo "    all                 build all gluon targets for each VPN"
   echo "    (optional) add \"fast\" as a parameter to build on multicore"
 #  echo "    (optional) add \"silent\" as a parameter to avoid loads of output"
+  echo "  clean <target>        targets provided by gluon"
+  echo "    all                 clean all targets"
+  echo "    (optional) add \"fast\" as a parameter to clean on multicore"
   echo "  create_manifest       create manifest"
   echo
 }
@@ -97,17 +100,23 @@ prepare_siteconf(){
     echo "Placeholder %B not found"
   fi
   if grep -q "%C" < "$EXECDIR"/site.conf; then
-    sed -i "/^%C$/c\\\\'http://autoupdate-lede.ffnw/v1/$vpn/testing\\'," "$EXECDIR"/site.conf
-    echo "Set autoupdater testing URL ..."
+    sed -i "/^%C$/c\\\\'http://autoupdate-lede.ffnw/v1/$vpn/rc\\'," "$EXECDIR"/site.conf
+    echo "Set autoupdater rc URL ..."
   else
     echo "Placeholder %C not found"
   fi
   if grep -q "%D" < "$EXECDIR"/site.conf; then
-    sed -i "/^%D$/c\\\\'http://autoupdate-lede.ffnw/v1/$vpn/nightly/master\\'," "$EXECDIR"/site.conf
-    echo "Set autoupdater nightly_master URL ..."
+    sed -i "/^%D$/c\\\\'http://autoupdate-lede.ffnw/v1/$vpn/testing\\'," "$EXECDIR"/site.conf
+    echo "Set autoupdater testing URL ..."
   else
     echo "Placeholder %D not found"
   fi
+  if grep -q "%E" < "$EXECDIR"/site.conf; then
+    sed -i "/^%E$/c\\\\'http://autoupdate-lede.ffnw/v1/$vpn/nightly/master\\'," "$EXECDIR"/site.conf
+    echo "Set autoupdater nightly_master URL ..."
+  else
+    echo "Placeholder %E not found"
+  fi
 }
 
 prepare_sitemk(){
@@ -142,29 +151,68 @@ prepare_sitemk(){
 }
 
 gluon_build(){
+  error_build=0
   if [ "$2" == "fast" ] && [ -a "/proc/cpuinfo" ]; then
       if [ "$3" == "silent" ]; then
         if [ -a "$EXECDIR/.BROKEN" ]; then
-          make --silent -C "$EXECDIR/.." -j $(($(grep -c processor /proc/cpuinfo)*2)) BROKEN=1 GLUON_TARGET="$1" GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")"
+          if ! make --silent -C "$EXECDIR/.." -j $(($(grep -c processor /proc/cpuinfo)*2)) BROKEN=1 GLUON_TARGET="$1" GLUON_AUTOUPDATER_ENABLED=1 GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")";
+          then
+            error_build=1
+          fi
         else
-          make --silent -C "$EXECDIR/.." -j $(($(grep -c processor /proc/cpuinfo)*2)) GLUON_TARGET="$1" GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")"
+          if ! make --silent -C "$EXECDIR/.." -j $(($(grep -c processor /proc/cpuinfo)*2)) GLUON_TARGET="$1" GLUON_AUTOUPDATER_ENABLED=1 GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")";
+          then
+            error_build=1
+          fi
         fi
       else
         if [ -a "$EXECDIR/.BROKEN" ]; then
-          make -C "$EXECDIR/.." -j $(($(grep -c processor /proc/cpuinfo)*2)) BROKEN=1 GLUON_TARGET="$1" GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")"
+          if ! make -C "$EXECDIR/.." -j $(($(grep -c processor /proc/cpuinfo)*2)) BROKEN=1 GLUON_TARGET="$1" GLUON_AUTOUPDATER_ENABLED=1 GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")";
+          then
+            error_build=1
+          fi
         else
-          make -C "$EXECDIR/.." -j $(($(grep -c processor /proc/cpuinfo)*2)) GLUON_TARGET="$1" GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")"
+          if ! make -C "$EXECDIR/.." -j $(($(grep -c processor /proc/cpuinfo)*2)) GLUON_TARGET="$1" GLUON_AUTOUPDATER_ENABLED=1 GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")";
+          then
+            error_build=1
+          fi
         fi
       fi
   else
     if [ -a "$EXECDIR/.BROKEN" ]; then
-      make -C "$EXECDIR/.." BROKEN=1 GLUON_TARGET="$1" GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")"
+      if ! make -C "$EXECDIR/.." BROKEN=1 GLUON_TARGET="$1" GLUON_AUTOUPDATER_ENABLED=1 GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")";
+      then
+        error_build=1
+      fi
+    else
+      if ! make -C "$EXECDIR/.." GLUON_TARGET="$1" GLUON_AUTOUPDATER_ENABLED=1 GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")";
+      then
+        error_build=1
+      fi
+    fi
+  fi
+  if [ $error_build -eq 1 ]; then
+    exit 1
+  fi
+}
+
+gluon_clean(){
+  if [ "$2" == "fast" ] && [ -a "/proc/cpuinfo" ]; then
+    if [ -a "$EXECDIR/.BROKEN" ]; then
+      make -C "$EXECDIR/.." -j $(($(grep -c processor /proc/cpuinfo)*2)) BROKEN=1 GLUON_TARGET="$1" GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")" clean
+    else
+      make -C "$EXECDIR/.." -j $(($(grep -c processor /proc/cpuinfo)*2)) GLUON_TARGET="$1" GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")" clean
+    fi
+  else
+    if [ -a "$EXECDIR/.BROKEN" ]; then
+      make -C "$EXECDIR/.." BROKEN=1 GLUON_TARGET="$1" GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")" clean
     else
-      make -C "$EXECDIR/.." GLUON_TARGET="$1" GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")"
+      make -C "$EXECDIR/.." GLUON_TARGET="$1" GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")" clean
     fi
   fi
 }
 
+
 prepare_precondition(){
   if ! [ -s "$EXECDIR/.GLUON_BRANCH" ]; then
     echo "please run '$0 prepare GLUON_BRANCH' first"
@@ -310,6 +358,44 @@ case "$1" in
       ;;
     esac
   ;;
+  "clean")
+    if ! [ -r "$EXECDIR"/.prepare ]; then
+      echo "please run the prepare mode first"
+      exit 1
+    fi
+    get_target_list
+    case "$2" in
+      "all")
+        for targ in "${TARGET_LIST[@]}"; do
+          if [ "$3" == "fast" ]; then
+              gluon_clean "$targ" "fast"
+          else
+            gluon_clean "$targ"
+          fi
+        done
+      ;;
+      *)
+        err="yes"
+        for targ in "${TARGET_LIST[@]}"; do
+          if [ "$targ" == "$2" ]; then
+            err="no"
+            if [ "$3" == "fast" ]; then
+              gluon_clean "$targ" "fast"
+            else
+              gluon_clean "$targ"
+            fi
+          fi
+        done
+        if [ "$err" == "yes" ]; then
+          echo "Please use targets from the following list as parameter:"
+          for targ in "${TARGET_LIST[@]}"; do
+            echo "$targ"
+          done
+        fi
+      ;;
+    esac
+  ;;
+
   "create_manifest")
     if ! [ -r "$EXECDIR"/.prepare ]; then
       echo "please run the prepare mode first"

domains/aurich.conf

@@ -2,28 +2,28 @@
 	domain_names = { aurich = 'Aurich' },
 	domain_seed = 'e985c7b8f3174811cd2f9e4cd2ccbf899adbc8f2b3ce0f3f28c8289c2b9599cb',
 
-	prefix6 = '2a06:e881:2000:4c01::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff01::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4c01::/64', },
 	prefix4 = '10.18.24.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:18:00',
+			id = 'ffnw-mesh_02:00:0a:12:18:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:18:00',
+			id = 'ffnw-mesh_02:00:0a:12:18:00',
 		},
 	},
 

domains/bad_iburg.conf

@@ -2,28 +2,28 @@
 	domain_names = { bad_iburg = 'Bad Iburg' },
 	domain_seed = '8aa86f0990b0c386bc70426c8afe19f783c181a87b6670c4ac83fb302cfb5de9',
 
-	prefix6 = '2a06:e881:2000:4303::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff02::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4303::/64' },
 	prefix4 = '10.18.88.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:58:00',
+			id = 'ffnw-mesh_02:00:0a:12:58:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:58:00',
+			id = 'ffnw-mesh_02:00:0a:12:58:00',
 		},
 	},
 
@@ -42,23 +42,31 @@
 			{
 				{
 					lat = 52.07,
-					lon = 7.99
+					lon = 7.9
 				},
 				{
 					lat = 52.07,
-					lon = 8.15
+					lon = 8.42
 				},
 				{
-					lat = 52.182,
-					lon = 8.15
+					lat = 52.23,
+					lon = 8.42
 				},
 				{
-					lat = 52.182,
-					lon = 7.99
+					lat = 52.23,
+					lon = 8.16
+				},
+				{
+					lat = 52.19,
+					lon = 8.16
+				},
+				{
+					lat = 52.19,
+					lon = 7.9
 				},
 				{
 					lat = 52.07,
-					lon = 7.99
+					lon = 7.9
 				}
 			}
 		}

domains/bremen.conf

+{
+	domain_names = { bremen = 'Bremen' },
+	domain_seed = 'da213cd742af54c91a6840f381ab8aaaf9ed0b5ff175f88175c76c07e85872ba',
+
+	prefix6 = '2a0f:b506:ff03::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4830::/64' },
+	prefix4 = '10.72.48.0/21',
+
+	wifi24 = {
+		ap = {
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
+			owe_transition_mode = true,
+		},
+		mesh = {
+			id = 'ffnw-mesh_02:00:0a:48:30:00',
+		},
+	},
+	wifi5 = {
+		ap = {
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
+			owe_transition_mode = true,
+		},
+		mesh = {
+			id = 'ffnw-mesh_02:00:0a:48:30:00',
+		},
+	},
+
+	next_node = {
+		name = { 'node.ffnw', 'nextnode', 'nn' },
+		ip6 = 'fd74:fdaa:9dc4::127',
+	},
+
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {'bre01.sn.ffnw.de:9001'}
+		},
+	},
+	hoodselector = {
+		shapes = {
+			{
+				{
+					lat = 53.22,
+					lon = 8.51
+				},
+				{
+					lat = 52.944,
+					lon = 8.51
+				},
+				{
+					lat = 52.944,
+					lon = 8.800048828125
+				},
+				{
+					lat = 53.03543290697411,
+					lon = 8.977890014648438
+				},
+				{
+					lat = 53.095673355930195,
+					lon = 8.993682861328125
+				},
+				{
+					lat = 53.160770182808506,
+					lon = 8.966217041015625
+				},
+				{
+					lat = 53.13400178113812,
+					lon = 8.865966796875
+				},
+				{
+					lat = 53.16324027106289,
+					lon = 8.834381103515625
+				},
+				{
+					lat = 53.1842302823796,
+					lon = 8.719711303710936
+				},
+				{
+					lat = 53.18505321083605,
+					lon = 8.675765991210938
+				},
+				{
+					lat = 53.22,
+					lon = 8.59405517578125
+				},
+				{
+					lat = 53.22,
+					lon = 8.51
+				}
+			}
+		}
+	}
+}

domains/butjadingen.conf

@@ -2,28 +2,28 @@
 	domain_names = { butjadingen = 'Butjadingen' },
 	domain_seed = '951aab38a95615e4803084ab6aac24f6722f316a2a7e482488df9bfa39908bd2',
 
-	prefix6 = '2a06:e881:2000:4500::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff04::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4500::/64' },
 	prefix4 = '10.18.176.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:b0:00',
+			id = 'ffnw-mesh_02:00:0a:12:b0:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:b0:00',
+			id = 'ffnw-mesh_02:00:0a:12:b0:00',
 		},
 	},
 

domains/default.conf

@@ -2,28 +2,28 @@
 	domain_names = { default = 'default', },
 	domain_seed = '67e4ecc921bc95678c1db7fcf3f684b82976b5b86c43e41511bb76b72c075b7b',
 
-	prefix6 = '2a06:e881:2000:4800::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', },
+	prefix6 = '2a0f:b506:ff05::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4800::/64' },
 	prefix4 = '10.18.224.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:e0:00',
+			id = 'ffnw-mesh_02:00:0a:12:e0:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:e0:00',
+			id = 'ffnw-mesh_02:00:0a:12:e0:00',
 		},
 	},
 

domains/grafschaft_bentheim.conf

@@ -2,28 +2,28 @@
 	domain_names = { grafschaft_bentheim = 'Grafschaft Bentheim' },
 	domain_seed = '5cf1fbc9e917174cc157870116183da68e1994ac75cce4cfe612a26b4fef606c',
 
-	prefix6 = '2a06:e881:2000:4a01::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff07::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4a01::/64' },
 	prefix4 = '10.18.80.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:50:00',
+			id = 'ffnw-mesh_02:00:0a:12:50:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:50:00',
+			id = 'ffnw-mesh_02:00:0a:12:50:00',
 		},
 	},
 

domains/ibbenbueren.conf

@@ -2,28 +2,28 @@
 	domain_names = { ibbenbueren = 'Ibbenbüren' },
 	domain_seed = 'ed7168fd157f2c00e26bedbd6ae533700030d9eb61f8877c3b168243c573c6c1',
 
-	prefix6 = '2a06:e881:2000:4201::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff08::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4201::/64' },
 	prefix4 = '10.18.72.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:48:00',
+			id = 'ffnw-mesh_02:00:0a:12:48:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:48:00',
+			id = 'ffnw-mesh_02:00:0a:12:48:00',
 		},
 	},
 

domains/landkreis_cloppenburg.conf

@@ -2,28 +2,28 @@
 	domain_names = { landkreis_cloppenburg = 'Landkreis Cloppenburg' },
 	domain_seed = 'd5e88687cf5191cd7341de1adcf019fde6b3af815b44a302b453df9d1d659702',
 
-	prefix6 = '2a06:e881:2000:4a00::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff09::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4a00::/64' },
 	prefix4 = '10.18.64.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:40:00',
+			id = 'ffnw-mesh_02:00:0a:12:40:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:40:00',
+			id = 'ffnw-mesh_02:00:0a:12:40:00',
 		},
 	},
 

domains/landkreis_emsland.conf

@@ -2,28 +2,28 @@
 	domain_names = { landkreis_emsland = 'Landkreis Emsland' },
 	domain_seed = 'b7edee1eb8f5e8cd884daaf9c491939c311f21e2652e664d860550d1cf167535',
 
-	prefix6 = '2a06:e881:2000:4901::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff0a::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4901::/64' },
 	prefix4 = '10.18.40.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:28:00',
+			id = 'ffnw-mesh_02:00:0a:12:28:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:28:00',
+			id = 'ffnw-mesh_02:00:0a:12:28:00',
 		},
 	},
 

domains/landkreis_friesland.conf

@@ -2,28 +2,28 @@
 	domain_names = { landkreis_friesland = 'Landkreis Friesland' },
 	domain_seed = '2c252eee0307427f37ada1046eb91b0568b794dd87f47e8ca798131f5d6f32a0',
 
-	prefix6 = '2a06:e881:2000:4600::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff0b::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4600::/64' },
 	prefix4 = '10.18.136.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:88:00',
+			id = 'ffnw-mesh_02:00:0a:12:88:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:88:00',
+			id = 'ffnw-mesh_02:00:0a:12:88:00',
 		},
 	},
 

domains/delmenhorst.conf → domains/landkreis_oldenburg.conf

 {
-	domain_names = { delmenhorst = 'Delmenhorst' },
+	domain_names = { landkreis_oldenburg = 'Landkreis Oldenburg' },
 	domain_seed = 'fa36ffc00f50ff8cb6bea8ff69c1532c36f993e990db5f94a739f18578b53850',
 
-	prefix6 = '2a06:e881:2000:4b00::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff06::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4b00::/64' },
 	prefix4 = '10.18.192.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:c0:00',
+			id = 'ffnw-mesh_02:00:0a:12:c0:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:c0:00',
+			id = 'ffnw-mesh_02:00:0a:12:c0:00',
 		},
 	},
 
@@ -34,7 +34,7 @@
 
 	mesh_vpn = {
 		tunneldigger = {
-			brokers = {'del01.sn.ffnw.de:9000'}
+			brokers = {'lkol01.sn.ffnw.de:9000'}
 		},
 	},
 	hoodselector = {
@@ -46,11 +46,11 @@
 				},
 				{
 					lat = 52.944,
-					lon = 8.78
+					lon = 8.51
 				},
 				{
 					lat = 53.22,
-					lon = 8.78
+					lon = 8.51
 				},
 				{
 					lat = 53.22,

domains/landkreis_osnabrueck.conf

@@ -2,28 +2,28 @@
 	domain_names = { landkreis_osnabrueck = 'Landkreis Osnabrück' },
 	domain_seed = 'ceb2284937f77b7b32776a4128c9b40ac71580a2183d2ae0f262eec527ccc2e4',
 
-	prefix6 = '2a06:e881:2000:4304::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff0c::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4304::/64' },
 	prefix4 = '10.18.200.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:c8:00',
+			id = 'ffnw-mesh_02:00:0a:12:c8:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:c8:00',
+			id = 'ffnw-mesh_02:00:0a:12:c8:00',
 		},
 	},
 
@@ -41,27 +41,19 @@
 		shapes = {
 			{
 				{
-					lat = 52.07,
+					lat = 52.19,
 					lon = 7.9
 				},
 				{
-					lat = 52.07,
-					lon = 7.99
-				},
-				{
-					lat = 52.182,
-					lon = 7.99
+					lat = 52.19,
+					lon = 8.16
 				},
 				{
-					lat = 52.182,
-					lon = 8.15
-				},
-				{
-					lat = 52.07,
-					lon = 8.15
+					lat = 52.23,
+					lon = 8.16
 				},
 				{
-					lat = 52.07,
+					lat = 52.23,
 					lon = 8.42
 				},
 				{
@@ -73,7 +65,7 @@
 					lon = 7.9
 				},
 				{
-					lat = 52.07,
+					lat = 52.19,
 					lon = 7.9
 				}
 			},

domains/landkreis_steinfurt.conf

@@ -2,28 +2,28 @@
 	domain_names = { landkreis_steinfurt = 'Landkreis Steinfurt', },
 	domain_seed = 'c0c0cde0eb9fa08d747e4fc615cffd9c5508f45a943994c0a3d7c701b38a9f42',
 
-	prefix6 = '2a06:e881:2000:4200::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', },
+	prefix6 = '2a0f:b506:ff0d::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4200::/64' },
 	prefix4 = '10.18.128.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:80:00',
+			id = 'ffnw-mesh_02:00:0a:12:80:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:80:00',
+			id = 'ffnw-mesh_02:00:0a:12:80:00',
 		},
 	},
 

domains/landkreis_vechta.conf

@@ -2,28 +2,28 @@
 	domain_names = { landkreis_vechta = 'Landkreis Vechta' },
 	domain_seed = 'f48b9e0b305ab55b59bd0357eca61d666712577896a124b515e696abd74fb491',
 
-	prefix6 = '2a06:e881:2000:4301::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff0e::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4301::/64' },
 	prefix4 = '10.18.168.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:a8:00',
+			id = 'ffnw-mesh_02:00:0a:12:a8:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:a8:00',
+			id = 'ffnw-mesh_02:00:0a:12:a8:00',
 		},
 	},
 

domains/landkreis_wesermarsch.conf

@@ -2,28 +2,28 @@
 	domain_names = { landkreis_wesermarsch = 'Landkreis Wesermarsch' },
 	domain_seed = 'c60ab076bc541743d86e3f69a58daa45d1d0c0e630a56edd68328bc209fd9e42',
 
-	prefix6 = '2a06:e881:2000:4501::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff0f::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4501::/64' },
 	prefix4 = '10.18.56.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:38:00',
+			id = 'ffnw-mesh_02:00:0a:12:38:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:38:00',
+			id = 'ffnw-mesh_02:00:0a:12:38:00',
 		},
 	},
 

domains/landkreis_wittmund.conf → domains/landkreis_wittmund_nord.conf

 {
-	domain_names = { landkreis_wittmund = 'Landkreis Wittmund' },
+	domain_names = { landkreis_wittmund_nord = 'Landkreis Wittmund Nord' },
 	domain_seed = '36efeb0741467bc1785b25f093f59d3ffee459c6fc52e299fa2dc4844cd8842e',
 
-	prefix6 = '2a06:e881:2000:4100::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff10::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4100::/64' },
 	prefix4 = '10.18.184.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:b8:00',
+			id = 'ffnw-mesh_02:00:0a:12:b8:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:b8:00',
+			id = 'ffnw-mesh_02:00:0a:12:b8:00',
 		},
 	},
 
@@ -41,31 +41,131 @@
 		shapes = {
 			{
 				{
-					lat = 53.372,
-					lon = 7.825
+					lat = 53.806,
+					lon = 7.648
+				},
+				{
+					lat = 53.55,
+					lon = 7.648
+				},
+				{
+					lat = 53.5514,
+					lon = 7.6614
+				},
+				{
+					lat = 53.5717,
+					lon = 7.7605
+				},
+				{
+					lat = 53.5717,
+					lon = 7.7625
+				},
+				{
+					lat = 53.5711,
+					lon = 7.7662
+				},
+				{
+					lat = 53.5685,
+					lon = 7.7737
+				},
+				{
+					lat = 53.5676,
+					lon = 7.7793
+				},
+				{
+					lat = 53.5678,
+					lon = 7.7842
+				},
+				{
+					lat = 53.5685,
+					lon = 7.7876
+				},
+				{
+					lat = 53.5694,
+					lon = 7.79
+				},
+				{
+					lat = 53.5704,
+					lon = 7.792
+				},
+				{
+					lat = 53.572,
+					lon = 7.7936
+				},
+				{
+					lat = 53.5731,
+					lon = 7.7939
+				},
+				{
+					lat = 53.5758,
+					lon = 7.7937
+				},
+				{
+					lat = 53.5761,
+					lon = 7.7942
+				},
+				{
+					lat = 53.5775,
+					lon = 7.8233
+				},
+				{
+					lat = 53.579,
+					lon = 7.8438
+				},
+				{
+					lat = 53.5789,
+					lon = 7.8483
+				},
+				{
+					lat = 53.5793,
+					lon = 7.8524
+				},
+				{
+					lat = 53.5787,
+					lon = 7.8617
+				},
+				{
+					lat = 53.5788,
+					lon = 7.8645
 				},
 				{
-					lat = 53.372,
-					lon = 7.9374
+					lat = 53.5853,
+					lon = 7.8897
 				},
 				{
-					lat = 53.3626,
-					lon = 7.9372
+					lat = 53.5868,
+					lon = 7.8978
 				},
 				{
-					lat = 53.3628,
-					lon = 7.9741
+					lat = 53.5867,
+					lon = 7.908
 				},
 				{
-					lat = 53.372,
-					lon = 7.9743
+					lat = 53.5854,
+					lon = 7.9151
 				},
 				{
-					lat = 53.3955,
-					lon = 7.9743
+					lat = 53.5821,
+					lon = 7.9231
 				},
 				{
-					lat = 53.3956,
+					lat = 53.5769,
+					lon = 7.929
+				},
+				{
+					lat = 53.5626,
+					lon = 7.9404
+				},
+				{
+					lat = 53.5586,
+					lon = 7.9445
+				},
+				{
+					lat = 53.5552,
+					lon = 7.9498
+				},
+				{
+					lat = 53.553,
 					lon = 7.956
 				},
 				{
@@ -91,18 +191,6 @@
 				{
 					lat = 53.806,
 					lon = 7.648
-				},
-				{
-					lat = 53.436,
-					lon = 7.648
-				},
-				{
-					lat = 53.436,
-					lon = 7.825
-				},
-				{
-					lat = 53.372,
-					lon = 7.825
 				}
 			}
 		}

domains/landkreis_wittmund_sued.conf

+{
+	domain_names = { landkreis_wittmund_sued = 'Landkreis Wittmund Süd' },
+	domain_seed = '52accd25f47be76464c0ff87b2ff8a6ba8e5dec3e744757764d177bff494b873',
+
+	prefix6 = '2a0f:b506:ff11::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4828::/64' },
+	prefix4 = '10.72.40.0/21',
+
+	wifi24 = {
+		ap = {
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
+			owe_transition_mode = true,
+		},
+		mesh = {
+			id = 'ffnw-mesh_02:00:0a:48:28:00',
+		},
+	},
+	wifi5 = {
+		ap = {
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
+			owe_transition_mode = true,
+		},
+		mesh = {
+			id = 'ffnw-mesh_02:00:0a:48:28:00',
+		},
+	},
+
+	next_node = {
+		name = { 'node.ffnw', 'nextnode', 'nn' },
+		ip6 = 'fd74:fdaa:9dc4::127',
+	},
+
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {'wtm_sued01.sn.ffnw:9002'}
+		},
+	},
+	hoodselector = {
+		shapes = {
+			{
+				{
+					lat = 53.372,
+					lon = 7.825
+				},
+				{
+					lat = 53.372,
+					lon = 7.9374
+				},
+				{
+					lat = 53.3626,
+					lon = 7.9372
+				},
+				{
+					lat = 53.3628,
+					lon = 7.9741
+				},
+				{
+					lat = 53.372,
+					lon = 7.9743
+				},
+				{
+					lat = 53.3955,
+					lon = 7.9743
+				},
+				{
+					lat = 53.3956,
+					lon = 7.956
+				},
+				{
+					lat = 53.553,
+					lon = 7.956
+				},
+				{
+					lat = 53.5552,
+					lon = 7.9498
+				},
+				{
+					lat = 53.5586,
+					lon = 7.9445
+				},
+				{
+					lat = 53.5626,
+					lon = 7.9404
+				},
+				{
+					lat = 53.5769,
+					lon = 7.929
+				},
+				{
+					lat = 53.5821,
+					lon = 7.9231
+				},
+				{
+					lat = 53.5854,
+					lon = 7.9151
+				},
+				{
+					lat = 53.5867,
+					lon = 7.908
+				},
+				{
+					lat = 53.5868,
+					lon = 7.8978
+				},
+				{
+					lat = 53.5853,
+					lon = 7.8897
+				},
+				{
+					lat = 53.5788,
+					lon = 7.8645
+				},
+				{
+					lat = 53.5787,
+					lon = 7.8617
+				},
+				{
+					lat = 53.5793,
+					lon = 7.8524
+				},
+				{
+					lat = 53.5789,
+					lon = 7.8483
+				},
+				{
+					lat = 53.579,
+					lon = 7.8438
+				},
+				{
+					lat = 53.5774,
+					lon = 7.8233
+				},
+				{
+					lat = 53.5761,
+					lon = 7.7942
+				},
+				{
+					lat = 53.5758,
+					lon = 7.7937
+				},
+				{
+					lat = 53.5731,
+					lon = 7.7939
+				},
+				{
+					lat = 53.572,
+					lon = 7.7936
+				},
+				{
+					lat = 53.5704,
+					lon = 7.792
+				},
+				{
+					lat = 53.5694,
+					lon = 7.79
+				},
+				{
+					lat = 53.5685,
+					lon = 7.7876
+				},
+				{
+					lat = 53.5678,
+					lon = 7.7842
+				},
+				{
+					lat = 53.5676,
+					lon = 7.7793
+				},
+				{
+					lat = 53.5685,
+					lon = 7.7737
+				},
+				{
+					lat = 53.5699,
+					lon = 7.7698
+				},
+				{
+					lat = 53.5711,
+					lon = 7.7662
+				},
+				{
+					lat = 53.5717,
+					lon = 7.7625
+				},
+				{
+					lat = 53.5717,
+					lon = 7.7605
+				},
+				{
+					lat = 53.5514,
+					lon = 7.6614
+				},
+				{
+					lat = 53.55,
+					lon = 7.648
+				},
+				{
+					lat = 53.436,
+					lon = 7.648
+				},
+				{
+					lat = 53.436,
+					lon = 7.825
+				},
+				{
+					lat = 53.372,
+					lon = 7.825
+				}
+			}
+		}
+	}
+}

domains/leer.conf

@@ -2,28 +2,28 @@
 	domain_names = { leer = 'Leer' },
 	domain_seed = 'ef1e0e53c6df30c482e61f9b504d41ee2623a88b9e3c53e6d59fe78ce24f106a',
 
-	prefix6 = '2a06:e881:2000:4c00::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff12::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4c00::/64' },
 	prefix4 = '10.18.208.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:d0:00',
+			id = 'ffnw-mesh_02:00:0a:12:d0:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:d0:00',
+			id = 'ffnw-mesh_02:00:0a:12:d0:00',
 		},
 	},
 

domains/lohne.conf

@@ -2,28 +2,28 @@
 	domain_names = { lohne = 'Lohne' },
 	domain_seed = '8b5029248dc02bdc1af2790cf487ba438704c513a117645a00a8f67f83dee08c',
 
-	prefix6 = '2a06:e881:2000:4300::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
+	prefix6 = '2a0f:b506:ff13::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4300::/64' },
 	prefix4 = '10.18.32.0/21',
 
 	wifi24 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:20:00',
+			id = 'ffnw-mesh_02:00:0a:12:20:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'test.nordwest.freifunk.net',
-			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			ssid = 'nordwest.freifunk.net',
+			owe_ssid = 'owe.nordwest.freifunk.net',
 			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0a:12:20:00',
+			id = 'ffnw-mesh_02:00:0a:12:20:00',
 		},
 	},