From 549bf3af4d9700d03f79679ea899eb94d51604f2 Mon Sep 17 00:00:00 2001
From: stebifan <stefan@tro-mail.de>
Date: Sat, 21 Feb 2015 12:54:29 +0100
Subject: [PATCH] Version 2.4.2

---
 modules   |  2 +-
 site.conf | 30 +++++++++++-------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/modules b/modules
index 171a090..7a07730 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,4 @@
 GLUON_SITE_FEEDS='tro'
 
 PACKAGES_TRO_REPO=https://github.com/Freifunk-Troisdorf/packages.git
-PACKAGES_TRO_COMMIT=0c249e15eac93844cb05156a6731b62abc7abbb7
\ No newline at end of file
+PACKAGES_TRO_COMMIT=d88fbc5e80d8e392d4931a727f36b21399a23504
\ No newline at end of file
diff --git a/site.conf b/site.conf
index fa1f060..d144c00 100644
--- a/site.conf
+++ b/site.conf
@@ -1,5 +1,5 @@
 {
-    hostname_prefix = 'freifunk',
+    hostname_prefix = 'tdf',
     site_name = 'Freifunk Troisdorf',
     site_code = 'Troisdorf',
     opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
@@ -41,6 +41,10 @@
         backbone = {
             limit = 2,
             peers = {
+                wupper0v6 = {
+                    key = '7142f897f4e55d2c19207aa59db92ec54d7517cf558d5ecaef33689234952a4b',
+                    remotes = {'"wupper0v6.freifunk-troisdorf.de" port 53840'},
+                },
                 wupper1v6 = {
                     key = 'c3fe61335a6c92d2557cdaf93db2b80e7e5b9704290ccdb0ad34ee01c56b9116',
                     remotes = {'"wupper1v6.freifunk-troisdorf.de" port 53840'},
@@ -61,7 +65,8 @@ autoupdater = {
                 name = 'stable',
                 mirrors = {
                     'http://update1.infra.fftdf/stable/sysupgrade',
-                    'http://[fda0:747e:ab29:7405::3]/stable/sysupgrade'
+                    'http://update2.infra.fftdf/stable/sysupgrade',
+                    'http://update3.infra.fftdf/stable/sysupgrade'
                 },
                 probability = 0.08,
                 good_signatures = 2,
@@ -76,7 +81,8 @@ autoupdater = {
                 name = 'beta',
                 mirrors = {
                     'http://update1.infra.fftdf/beta/sysupgrade',
-                    'http://[fda0:747e:ab29:7405::3]/beta/sysupgrade'
+                    'http://update2.infra.fftdf/beta/sysupgrade',
+                    'http://update3.infra.fftdf/beta/sysupgrade'
                 },
                 probability = 0.08,
                 good_signatures = 1,
@@ -90,7 +96,8 @@ autoupdater = {
                 name = 'experimental',
                 mirrors = {
                     'http://update1.infra.fftdf/experimental/sysupgrade',
-                    'http://[fda0:747e:ab29:7405::3]/experimental/sysupgrade'
+                    'http://update2.infra.fftdf/experimental/sysupgrade',
+                    'http://update3.infra.fftdf/experimental/sysupgrade'
                 },
                 probability = 1.00,
                 good_signatures = 1,
@@ -100,21 +107,6 @@ autoupdater = {
                     '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
                 },
             },
-            preview = {
-                name = 'preview',
-                mirrors = {
-                    'http://update1.infra.fftdf/preview/sysupgrade',
-                    'http://[fda0:747e:ab29:7405::3]/preview/sysupgrade'
-                },
-                probability = 1.00,
-                good_signatures = 1,
-                pubkeys = {
-                    '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
-                    '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
-                    '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
-                },
-            },
-
         },
     },
     simple_tc = {