v1.11.2 (Gluon 2021.1.1)

-------------------------------- - Added new VPN hosts & new network ranges
ffddorf · Feb 10, 2022 · c54c7da · c54c7da
1 parent 543441f
commit c54c7da
Show file tree

Hide file tree

Showing 21 changed files with 99 additions and 33 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,9 @@
 Changelog for Freifunk Düsseldorf & Neuss gluon firmware
 
+v1.11.2 (Gluon 2021.1.1)
+--------------------------------
+- Added new VPN hosts & new network ranges
+
 v1.11.1 (Gluon 2021.1.1)
 --------------------------------
 - Switched to Gluon 2021.1.1

diff --git a/domains/ffddorf_dom0.conf b/domains/ffddorf_dom0.conf
@@ -14,7 +14,7 @@
 
     prefix4 = '10.25.32.0/20',
     prefix6 = 'fd00:ffdd:21::/64',
-    extra_prefixes6 = {'2a03:2260:3004:21::/64','2a03:2260:3015:21::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:21::/64','2a03:2260:3015:21::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -46,6 +46,10 @@
                 'vpn02-dom0.freifunk-duesseldorf.de:11000',
                 'vpn03-dom0.freifunk-duesseldorf.de:11000',
                 'vpn04-dom0.freifunk-duesseldorf.de:11000',
+                'vpn05-dom0.freifunk-duesseldorf.de:11000',
+                'vpn06-dom0.freifunk-duesseldorf.de:11000',
+                'vpn07-dom0.freifunk-duesseldorf.de:11000',
+                'vpn08-dom0.freifunk-duesseldorf.de:11000',
             },
         },
     },

diff --git a/domains/ffddorf_dom1.conf b/domains/ffddorf_dom1.conf
@@ -12,7 +12,7 @@
 
     prefix4 = '10.25.48.0/20',
     prefix6 = 'fd00:ffdd:22::/64',
-    extra_prefixes6 = {'2a03:2260:3004:22::/64','2a03:2260:3015:22::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:22::/64','2a03:2260:3015:22::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -44,6 +44,10 @@
                 'vpn02-dom1.freifunk-duesseldorf.de:11001',
                 'vpn03-dom1.freifunk-duesseldorf.de:11001',
                 'vpn04-dom1.freifunk-duesseldorf.de:11001',
+                'vpn05-dom1.freifunk-duesseldorf.de:11001',
+                'vpn06-dom1.freifunk-duesseldorf.de:11001',
+                'vpn07-dom1.freifunk-duesseldorf.de:11001',
+                'vpn08-dom1.freifunk-duesseldorf.de:11001',
             },
         },
     },

diff --git a/domains/ffddorf_dom10.conf b/domains/ffddorf_dom10.conf
@@ -8,7 +8,7 @@
 
     prefix4 = '10.25.192.0/20',
     prefix6 = 'fd00:ffdd:72::/64',
-    extra_prefixes6 = {'2a03:2260:3004:72::/64','2a03:2260:3015:72::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:72::/64','2a03:2260:3015:72::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -40,6 +40,10 @@
                 'vpn02-dom10.freifunk-duesseldorf.de:11010',
                 'vpn03-dom10.freifunk-duesseldorf.de:11010',
                 'vpn04-dom10.freifunk-duesseldorf.de:11010',
+                'vpn05-dom10.freifunk-duesseldorf.de:11010',
+                'vpn06-dom10.freifunk-duesseldorf.de:11010',
+                'vpn07-dom10.freifunk-duesseldorf.de:11010',
+                'vpn08-dom10.freifunk-duesseldorf.de:11010',
             },
         },
     },

diff --git a/domains/ffddorf_dom2.conf b/domains/ffddorf_dom2.conf
@@ -12,7 +12,7 @@
 
     prefix4 = '10.25.64.0/20',
     prefix6 = 'fd00:ffdd:23::/64',
-    extra_prefixes6 = {'2a03:2260:3004:23::/64','2a03:2260:3015:23::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:23::/64','2a03:2260:3015:23::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -44,6 +44,10 @@
                 'vpn02-dom2.freifunk-duesseldorf.de:11002',
                 'vpn03-dom2.freifunk-duesseldorf.de:11002',
                 'vpn04-dom2.freifunk-duesseldorf.de:11002',
+                'vpn05-dom2.freifunk-duesseldorf.de:11002',
+                'vpn06-dom2.freifunk-duesseldorf.de:11002',
+                'vpn07-dom2.freifunk-duesseldorf.de:11002',
+                'vpn08-dom2.freifunk-duesseldorf.de:11002',
             },
         },
     },

diff --git a/domains/ffddorf_dom3.conf b/domains/ffddorf_dom3.conf
@@ -8,7 +8,7 @@
 
     prefix4 = '10.25.80.0/20',
     prefix6 = 'fd00:ffdd:46::/64',
-    extra_prefixes6 = {'2a03:2260:3004:46::/64','2a03:2260:3015:46::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:46::/64','2a03:2260:3015:46::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -40,6 +40,10 @@
                 'vpn02-dom3.freifunk-duesseldorf.de:11003',
                 'vpn03-dom3.freifunk-duesseldorf.de:11003',
                 'vpn04-dom3.freifunk-duesseldorf.de:11003',
+                'vpn05-dom3.freifunk-duesseldorf.de:11003',
+                'vpn06-dom3.freifunk-duesseldorf.de:11003',
+                'vpn07-dom3.freifunk-duesseldorf.de:11003',
+                'vpn08-dom3.freifunk-duesseldorf.de:11003',
             },
         },
     },

diff --git a/domains/ffddorf_dom4.conf b/domains/ffddorf_dom4.conf
@@ -13,7 +13,7 @@
 
     prefix4 = '10.25.96.0/20',
     prefix6 = 'fd00:ffdd:47::/64',
-    extra_prefixes6 = {'2a03:2260:3004:47::/64','2a03:2260:3015:47::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:47::/64','2a03:2260:3015:47::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -45,6 +45,10 @@
                 'vpn02-dom4.freifunk-duesseldorf.de:11004',
                 'vpn03-dom4.freifunk-duesseldorf.de:11004',
                 'vpn04-dom4.freifunk-duesseldorf.de:11004',
+                'vpn05-dom4.freifunk-duesseldorf.de:11004',
+                'vpn06-dom4.freifunk-duesseldorf.de:11004',
+                'vpn07-dom4.freifunk-duesseldorf.de:11004',
+                'vpn08-dom4.freifunk-duesseldorf.de:11004',
             },
         },
     },

diff --git a/domains/ffddorf_dom5.conf b/domains/ffddorf_dom5.conf
@@ -8,7 +8,7 @@
 
     prefix4 = '10.25.112.0/20',
     prefix6 = 'fd00:ffdd:48::/64',
-    extra_prefixes6 = {'2a03:2260:3004:48::/64','2a03:2260:3015:48::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:48::/64','2a03:2260:3015:48::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -40,6 +40,10 @@
                 'vpn02-dom5.freifunk-duesseldorf.de:11005',
                 'vpn03-dom5.freifunk-duesseldorf.de:11005',
                 'vpn04-dom5.freifunk-duesseldorf.de:11005',
+                'vpn05-dom5.freifunk-duesseldorf.de:11005',
+                'vpn06-dom5.freifunk-duesseldorf.de:11005',
+                'vpn07-dom5.freifunk-duesseldorf.de:11005',
+                'vpn08-dom5.freifunk-duesseldorf.de:11005',
             },
         },
     },

diff --git a/domains/ffddorf_dom6.conf b/domains/ffddorf_dom6.conf
@@ -10,7 +10,7 @@
 
     prefix4 = '10.25.128.0/20',
     prefix6 = 'fd00:ffdd:54::/64',
-    extra_prefixes6 = {'2a03:2260:3004:54::/64','2a03:2260:3015:54::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:54::/64','2a03:2260:3015:54::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -42,6 +42,10 @@
                 'vpn02-dom6.freifunk-duesseldorf.de:11006',
                 'vpn03-dom6.freifunk-duesseldorf.de:11006',
                 'vpn04-dom6.freifunk-duesseldorf.de:11006',
+                'vpn05-dom6.freifunk-duesseldorf.de:11006',
+                'vpn06-dom6.freifunk-duesseldorf.de:11006',
+                'vpn07-dom6.freifunk-duesseldorf.de:11006',
+                'vpn08-dom6.freifunk-duesseldorf.de:11006',
             },
         },
     },

diff --git a/domains/ffddorf_dom7.conf b/domains/ffddorf_dom7.conf
@@ -8,7 +8,7 @@
 
     prefix4 = '10.25.144.0/20',
     prefix6 = 'fd00:ffdd:58::/64',
-    extra_prefixes6 = {'2a03:2260:3004:58::/64','2a03:2260:3015:58::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:58::/64','2a03:2260:3015:58::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -40,6 +40,10 @@
                 'vpn02-dom7.freifunk-duesseldorf.de:11007',
                 'vpn03-dom7.freifunk-duesseldorf.de:11007',
                 'vpn04-dom7.freifunk-duesseldorf.de:11007',
+                'vpn05-dom7.freifunk-duesseldorf.de:11007',
+                'vpn06-dom7.freifunk-duesseldorf.de:11007',
+                'vpn07-dom7.freifunk-duesseldorf.de:11007',
+                'vpn08-dom7.freifunk-duesseldorf.de:11007',
             },
         },
     },

diff --git a/domains/ffddorf_dom8.conf b/domains/ffddorf_dom8.conf
@@ -12,7 +12,7 @@
 
     prefix4 = '10.25.160.0/20',
     prefix6 = 'fd00:ffdd:59::/64',
-    extra_prefixes6 = {'2a03:2260:3004:59::/64','2a03:2260:3015:59::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:59::/64','2a03:2260:3015:59::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -44,6 +44,10 @@
                 'vpn02-dom8.freifunk-duesseldorf.de:11008',
                 'vpn03-dom8.freifunk-duesseldorf.de:11008',
                 'vpn04-dom8.freifunk-duesseldorf.de:11008',
+                'vpn05-dom8.freifunk-duesseldorf.de:11008',
+                'vpn06-dom8.freifunk-duesseldorf.de:11008',
+                'vpn07-dom8.freifunk-duesseldorf.de:11008',
+                'vpn08-dom8.freifunk-duesseldorf.de:11008',
             },
         },
     },

diff --git a/domains/ffddorf_dom9.conf b/domains/ffddorf_dom9.conf
@@ -10,7 +10,7 @@
 
     prefix4 = '10.25.176.0/20',
     prefix6 = 'fd00:ffdd:62::/64',
-    extra_prefixes6 = {'2a03:2260:3004:62::/64','2a03:2260:3015:62::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:62::/64','2a03:2260:3015:62::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -42,6 +42,10 @@
                 'vpn02-dom9.freifunk-duesseldorf.de:11009',
                 'vpn03-dom9.freifunk-duesseldorf.de:11009',
                 'vpn04-dom9.freifunk-duesseldorf.de:11009',
+                'vpn05-dom9.freifunk-duesseldorf.de:11009',
+                'vpn06-dom9.freifunk-duesseldorf.de:11009',
+                'vpn07-dom9.freifunk-duesseldorf.de:11009',
+                'vpn08-dom9.freifunk-duesseldorf.de:11009',
             },
         },
     },

diff --git a/domains/ffneuss_dom0.conf b/domains/ffneuss_dom0.conf
@@ -10,7 +10,7 @@
 
     prefix4 = '10.30.32.0/20',
     prefix6 = 'fd00:ff30:10::/64',
-    extra_prefixes6 = {'2a03:2260:3003:10::/64'},
+    extra_prefixes6 = {'2a03:2260:3003:10::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -42,6 +42,10 @@
                 'vpn02-dom0.freifunk-neuss.de:12000',
                 'vpn03-dom0.freifunk-neuss.de:12000',
                 'vpn04-dom0.freifunk-neuss.de:12000',
+                'vpn05-dom0.freifunk-neuss.de:12000',
+                'vpn06-dom0.freifunk-neuss.de:12000',
+                'vpn07-dom0.freifunk-neuss.de:12000',
+                'vpn08-dom0.freifunk-neuss.de:12000',
             },
         },
     },

diff --git a/domains/ffneuss_dom1.conf b/domains/ffneuss_dom1.conf
@@ -10,7 +10,7 @@
 
     prefix4 = '10.30.48.0/20',
     prefix6 = 'fd00:ff30:11::/64',
-    extra_prefixes6 = {'2a03:2260:3003:11::/64'},
+    extra_prefixes6 = {'2a03:2260:3003:11::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -42,6 +42,10 @@
                 'vpn02-dom1.freifunk-neuss.de:12001',
                 'vpn03-dom1.freifunk-neuss.de:12001',
                 'vpn04-dom1.freifunk-neuss.de:12001',
+                'vpn05-dom1.freifunk-neuss.de:12001',
+                'vpn06-dom1.freifunk-neuss.de:12001',
+                'vpn07-dom1.freifunk-neuss.de:12001',
+                'vpn08-dom1.freifunk-neuss.de:12001',
             },
         },
     },

diff --git a/domains/ffneuss_dom2.conf b/domains/ffneuss_dom2.conf
@@ -10,7 +10,7 @@
 
     prefix4 = '10.30.64.0/20',
     prefix6 = 'fd00:ff30:12::/64',
-    extra_prefixes6 = {'2a03:2260:3003:12::/64'},
+    extra_prefixes6 = {'2a03:2260:3003:12::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -42,6 +42,10 @@
                 'vpn02-dom2.freifunk-neuss.de:12002',
                 'vpn03-dom2.freifunk-neuss.de:12002',
                 'vpn04-dom2.freifunk-neuss.de:12002',
+                'vpn05-dom2.freifunk-neuss.de:12002',
+                'vpn06-dom2.freifunk-neuss.de:12002',
+                'vpn07-dom2.freifunk-neuss.de:12002',
+                'vpn08-dom2.freifunk-neuss.de:12002',
             },
         },
     },

diff --git a/domains/ffneuss_dom3.conf b/domains/ffneuss_dom3.conf
@@ -11,7 +11,7 @@
 
     prefix4 = '10.30.80.0/20',
     prefix6 = 'fd00:ff30:13::/64',
-    extra_prefixes6 = {'2a03:2260:3003:13::/64'},
+    extra_prefixes6 = {'2a03:2260:3003:13::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -43,6 +43,10 @@
                 'vpn02-dom3.freifunk-neuss.de:12003',
                 'vpn03-dom3.freifunk-neuss.de:12003',
                 'vpn04-dom3.freifunk-neuss.de:12003',
+                'vpn05-dom3.freifunk-neuss.de:12003',
+                'vpn06-dom3.freifunk-neuss.de:12003',
+                'vpn07-dom3.freifunk-neuss.de:12003',
+                'vpn08-dom3.freifunk-neuss.de:12003',
             },
         },
     },

diff --git a/domains/ffneuss_dom4.conf b/domains/ffneuss_dom4.conf
@@ -11,7 +11,7 @@
 
     prefix4 = '10.30.96.0/20',
     prefix6 = 'fd00:ff30:14::/64',
-    extra_prefixes6 = {'2a03:2260:3003:14::/64'},
+    extra_prefixes6 = {'2a03:2260:3003:14::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -43,6 +43,10 @@
                 'vpn02-dom4.freifunk-neuss.de:12004',
                 'vpn03-dom4.freifunk-neuss.de:12004',
                 'vpn04-dom4.freifunk-neuss.de:12004',
+                'vpn05-dom4.freifunk-neuss.de:12004',
+                'vpn06-dom4.freifunk-neuss.de:12004',
+                'vpn07-dom4.freifunk-neuss.de:12004',
+                'vpn08-dom4.freifunk-neuss.de:12004',
             },
         },
     },

diff --git a/domains/ffneuss_dom5.conf b/domains/ffneuss_dom5.conf
@@ -12,7 +12,7 @@
 
     prefix4 = '10.30.112.0/20',
     prefix6 = 'fd00:ff30:15::/64',
-    extra_prefixes6 = {'2a03:2260:3003:15::/64'},
+    extra_prefixes6 = {'2a03:2260:3003:15::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -44,6 +44,10 @@
                 'vpn02-dom5.freifunk-neuss.de:12005',
                 'vpn03-dom5.freifunk-neuss.de:12005',
                 'vpn04-dom5.freifunk-neuss.de:12005',
+                'vpn05-dom5.freifunk-neuss.de:12005',
+                'vpn06-dom5.freifunk-neuss.de:12005',
+                'vpn07-dom5.freifunk-neuss.de:12005',
+                'vpn08-dom5.freifunk-neuss.de:12005',
             },
         },
     },

diff --git a/domains/legacy.conf b/domains/legacy.conf
@@ -5,7 +5,7 @@
 
     prefix4 = '10.25.0.0/19',
     prefix6 = 'fd00:ffdd::/64',
-    extra_prefixes6 = {'2a03:2260:3004:25::/64','2a03:2260:3015:25::/64'},
+    extra_prefixes6 = {'2a03:2260:3004:25::/64','2a03:2260:3015:25::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -37,6 +37,10 @@
                 'vpn02.freifunk-duesseldorf.de:10050',
                 'vpn03.freifunk-duesseldorf.de:10050',
                 'vpn04.freifunk-duesseldorf.de:10050',
+                'vpn05.freifunk-duesseldorf.de:10050',
+                'vpn06.freifunk-duesseldorf.de:10050',
+                'vpn07.freifunk-duesseldorf.de:10050',
+                'vpn08.freifunk-duesseldorf.de:10050',
             },
         },
     },

diff --git a/domains/legacy_neuss.conf b/domains/legacy_neuss.conf
@@ -5,7 +5,7 @@
 
     prefix4 = '10.30.0.0/19',
     prefix6 = 'fd00:ff30::/64',
-    extra_prefixes6 = {'2a03:2260:3003:30::/64'},
+    extra_prefixes6 = {'2a03:2260:3003:30::/64','2001:678:b7c:1500::/56'},
 
     wifi24 = {
         ap = {
@@ -37,6 +37,10 @@
                 'supernode2.freifunk-neuss.de:10030',
                 'supernode3.freifunk-neuss.de:10030',
                 'supernode4.freifunk-neuss.de:10030',
+                'vpn01.freifunk-neuss.de:10030',
+                'vpn02.freifunk-neuss.de:10030',
+                'vpn03.freifunk-neuss.de:10030',
+                'vpn04.freifunk-neuss.de:10030',
             },
         },
     },