From 440f687eaba4cbbf478a5ede5513e7bd416e7c2d Mon Sep 17 00:00:00 2001
From: rubo77 <github@r.z11.de>
Date: Wed, 2 Jan 2019 18:27:15 +0100
Subject: [PATCH] reverted Hypergw1 Vorbereitungen (reverted from commit
 2b335d295c9a515cc8962a84b9c86161e75b6c43)

---
 site.conf | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/site.conf b/site.conf
index cb6eff0..ba7b0e9 100644
--- a/site.conf
+++ b/site.conf
@@ -7,9 +7,9 @@
   domain_seed = '718966471108bd550c01001f8a6f609c34507b6b8bcd5672232f5d9acddae8b4',
   
   opkg = {
-    lede = 'http://[fd42:eb49:c0b5:4242::fd30]/lede/snapshots/packages/%A',
+    lede = 'http://[fd42:eb49:c0b5:4242::fd00]/lede/snapshots/packages/%A',
     extra = {
-      gluon = 'http://[fd42:eb49:c0b5:4242::fd30]/packages/gluon-%GS-%GR/%S',
+      gluon = 'http://[fd42:eb49:c0b5:4242::fd00]/packages/gluon-%GS-%GR/%S',
     },
   },
   
@@ -30,7 +30,6 @@
     'fd42:eb49:c0b5:4242::fd05',
     'fd42:eb49:c0b5:4242::fd06',
     'fd42:eb49:c0b5:4242::fd20',
-    'fd42:eb49:c0b5:4242::fd30',
   },
   
   -- Wireless regulatory domain of your community.
@@ -208,10 +207,6 @@
               key = 'e12ab3ae5955e1380cd18908edd18e006ba11fa471335ed7b2d2776401da58b0',
               remotes = {'ipv4 "20.gw.freifunknord.de" port 10050', 'ipv6 "20.gw.freifunknord.de" port 10050'},
             },
-            ffnord_vpn30 = {
-              key = 'eb4c8a1608608a28633833ce89e2e2b432ef08b538336486a0b6a4985f7cff6',
-              remotes = {'ipv4 "1.hypergw.freifunknord.de" port 10050', 'ipv6 "1.hypergw.freifunknord.de" port 10050'},
-            },
           },
         },
       },
@@ -233,19 +228,18 @@
         name = 'stable',
         mirrors = {
           -- List of mirrors to fetch images from. IPv6 required!
-          'http://[fd42:eb49:c0b5:4242::fd30]/firmware/stable/sysupgrade',
-          'http://[fd42:eb49:c0b5:4242::fd00]/firmware/stable/sysupgrade',
-          'http://[fd42:eb49:c0b5:4242::fd01]/firmware/stable/sysupgrade',
-          'http://[fd42:eb49:c0b5:4242::fd02]/firmware/stable/sysupgrade',
-          'http://0.update.ffnord/firmware/stable/sysupgrade',
-          'http://1.update.ffnord/firmware/stable/sysupgrade',
-          'http://2.update.ffnord/firmware/stable/sysupgrade',
-          'http://1hyper.update.ffnord/firmware/stable/sysupgrade',
-          'http://update.freifunknord.de/firmware/stable/sysupgrade',
+          'http://[fd42:eb49:c0b5:4242::fd00]/firmware/stable/sysupgrade/',
+          'http://[fd42:eb49:c0b5:4242::fd01]/firmware/stable/sysupgrade/',
+          'http://[fd42:eb49:c0b5:4242::fd02]/firmware/stable/sysupgrade/',
+          'http://0.update.ffnord/firmware/stable/sysupgrade/',
+          'http://1.update.ffnord/firmware/stable/sysupgrade/',
+          'http://2.update.ffnord/firmware/stable/sysupgrade/',
+          'http://update.freifunknord.de/firmware/stable/sysupgrade/',
         },
         good_signatures = 2,
         pubkeys = {
           'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
+          '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
           '589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
           '9885f836464abf3633f92701e4febeefec54f481d8b6cd39085e6ad24162ff82', -- rubo77
           '359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- sven (FF-FL)
-- 
GitLab