From 874698b12d312a244ea62a88009901170c1be8e2 Mon Sep 17 00:00:00 2001
From: Bastian <mephisto@mephis.to>
Date: Tue, 6 Oct 2020 14:13:12 +0000
Subject: [PATCH] Remove ip's from VPN endpoints, remove wireguard teststuff
 from testsegment

---
 domains/ffrgb_cty.conf |  6 ------
 domains/ffrgb_tst.conf | 34 ++++++++++++++++++++++++++++++----
 domains/ffrgb_uml.conf |  6 ------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf
index 0440530..fe27eac 100644
--- a/domains/ffrgb_cty.conf
+++ b/domains/ffrgb_cty.conf
@@ -67,12 +67,6 @@
                 '"gw11.regensburg.freifunk.net" port 10010',
                 '"gw11.regensburg.freifunk.net" port 10011',
                 '"gw11.regensburg.freifunk.net" port 10012',
-                'ipv6 "2a00:9d80:8000:2007::131" port 10010',
-                'ipv6 "2a00:9d80:8000:2007::131" port 10011',
-                'ipv6 "2a00:9d80:8000:2007::131" port 10012',
-                'ipv4 "185.53.218.131" port 10010',
-                'ipv4 "185.53.218.131" port 10011',
-                'ipv4 "185.53.218.131" port 10012',
               },
             },
             gwsec = {   --[[ coldstandby ]]
diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf
index b2d1d1c..b938fb6 100644
--- a/domains/ffrgb_tst.conf
+++ b/domains/ffrgb_tst.conf
@@ -53,10 +53,36 @@
   },
 
   mesh_vpn = {
-    mtu = 1364,
-    tunneldigger = {
-      brokers {
-        'gw13.ffrgb.net:20001',
+    mtu = 1312,
+    fastd = {
+      groups = {
+        backbone = {
+          limit = 1,
+          peers = {
+            gwpri = {   --[[ primary ]]
+              key = '377e0246271bfbf4c99c2d156ee0eb77c16bb5629841fde507cfab6760162b61',
+              remotes = {
+                '"gw31.ffrgb.net" port 10030',
+                '"gw31.ffrgb.net" port 10031',
+                '"gw31.ffrgb.net" port 10032',
+                '"gw31.regensburg.freifunk.net" port 10030',
+                '"gw31.regensburg.freifunk.net" port 10031',
+                '"gw31.regensburg.freifunk.net" port 10032',
+              },
+            },
+            gwsec = {   --[[ coldstandby ]]
+              key = '0000000000000000000000000000000000000000000000000000000000000000',
+              remotes = {
+                '"gw32.ffrgb.net" port 10030',
+                '"gw32.ffrgb.net" port 10031',
+                '"gw32.ffrgb.net" port 10032',
+                '"gw32.regensburg.freifunk.net" port 10030',
+                '"gw32.regensburg.freifunk.net" port 10031',
+                '"gw32.regensburg.freifunk.net" port 10032',
+              },
+            },
+          },
+        },
       },
     },
   },
diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf
index 638a793..4093b28 100644
--- a/domains/ffrgb_uml.conf
+++ b/domains/ffrgb_uml.conf
@@ -67,12 +67,6 @@
                 '"gw21.regensburg.freifunk.net" port 10020',
                 '"gw21.regensburg.freifunk.net" port 10021',
                 '"gw21.regensburg.freifunk.net" port 10022',
-                'ipv6 "2a00:9d80:8000:2007::132" port 10020',
-                'ipv6 "2a00:9d80:8000:2007::132" port 10021',
-                'ipv6 "2a00:9d80:8000:2007::132" port 10022',
-                'ipv4 "185.53.218.132" port 10020',
-                'ipv4 "185.53.218.132" port 10021',
-                'ipv4 "185.53.218.132" port 10022',
               },
             },
             gwsec = {   --[[ coldstandby ]]