Merge pull request #290 from grische/fix/ffwert_domains

domains: update ffwert domains
freifunkMUC · Nov 7, 2023 · 82877a4 · 82877a4
2 parents 4192485 + 6424d61
commit 82877a4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/domains/ffwert_city.conf b/domains/ffwert_city.conf
@@ -6,12 +6,12 @@
 
   domain_seed = 'ef14c53a30580124e31a1824294b11c16a5e0a0fd083d226e8527f471a3583c3',
 
-  prefix4 = '10.80.232.0/21',
-  prefix6 = 'fd62:f45c:4d09:10d::/64',
+  prefix4 = '10.86.0.0/21',
+  prefix6 = 'fd62:f45c:4d09:180::/64',
 
   extra_prefixes6 = {
-  '2001:678:e68:10d::/64',
-  '2001:678:ed0:10d::/64',
+  '2001:678:e68:180::/64',
+  '2001:678:ed0:180::/64',
   },
 
   wifi24 = {
@@ -41,8 +41,8 @@
 
   next_node = {
     name = { 'next.node' },
-    ip4 = '10.80.232.1',
-    ip6 = 'fd62:f45c:4d09:10d::1',
+    ip4 = '10.86.0.1',
+    ip6 = 'fd62:f45c:4d09:180::1',
   },
 
   mesh_vpn = {
@@ -55,22 +55,22 @@
       peers = {
         {
           publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=',
-          endpoint ='gw04.ext.ffmuc.net:40017',
+          endpoint ='gw04.ext.ffmuc.net:40180',
           link_address='fe80::27c:16ff:fec0:6c74',
         },
         {
           publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=',
-          endpoint ='gw05.ext.ffmuc.net:40017',
+          endpoint ='gw05.ext.ffmuc.net:40180',
           link_address='fe80::281:8eff:fef0:73aa',
         },
         {
           publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=',
-          endpoint ='gw06.ext.ffmuc.net:40017',
+          endpoint ='gw06.ext.ffmuc.net:40180',
           link_address='fe80::2a2:e4ff:fef9:2269',
         },
         {
           publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=',
-          endpoint ='gw07.ext.ffmuc.net:40017',
+          endpoint ='gw07.ext.ffmuc.net:40180',
           link_address='fe80::23b:d2ff:fe95:967f',
         },
       },

diff --git a/domains/ffwert_events.conf b/domains/ffwert_events.conf
@@ -6,12 +6,12 @@
 
   domain_seed = '617c853fbb7242936dbe410f9a828dca5b6f96e85f42e42808a39b21e002db93',
 
-  prefix4 = '10.80.240.0/21',
-  prefix6 = 'fd62:f45c:4d09:10e::/64',
+  prefix4 = '10.86.8.0/21',
+  prefix6 = 'fd62:f45c:4d09:181::/64',
 
   extra_prefixes6 = {
-  '2001:678:e68:10e::/64',
-  '2001:678:ed0:10e::/64',
+  '2001:678:e68:181::/64',
+  '2001:678:ed0:181::/64',
   },
 
   wifi24 = {
@@ -41,8 +41,8 @@
 
   next_node = {
     name = { 'next.node' },
-    ip4 = '10.80.240.1',
-    ip6 = 'fd62:f45c:4d09:10e::1',
+    ip4 = '10.86.8.1',
+    ip6 = 'fd62:f45c:4d09:181::1',
   },
 
   mesh_vpn = {
@@ -55,22 +55,22 @@
       peers = {
         {
           publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=',
-          endpoint ='gw04.ext.ffmuc.net:40018',
+          endpoint ='gw04.ext.ffmuc.net:40181',
           link_address='fe80::27c:16ff:fec0:6c74',
         },
         {
           publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=',
-          endpoint ='gw05.ext.ffmuc.net:40018',
+          endpoint ='gw05.ext.ffmuc.net:40181',
           link_address='fe80::281:8eff:fef0:73aa',
         },
         {
           publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=',
-          endpoint ='gw06.ext.ffmuc.net:40018',
+          endpoint ='gw06.ext.ffmuc.net:40181',
           link_address='fe80::2a2:e4ff:fef9:2269',
         },
         {
           publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=',
-          endpoint ='gw07.ext.ffmuc.net:40018',
+          endpoint ='gw07.ext.ffmuc.net:40181',
           link_address='fe80::23b:d2ff:fe95:967f',
         },
       },