From 2869c7d8f7b8b1e8a6dde084a1c85646f0380734 Mon Sep 17 00:00:00 2001
From: stebifan <stefan@tro-mail.de>
Date: Mon, 15 Feb 2016 21:43:09 +0100
Subject: [PATCH] Daily Build, Node Roles Typo, probability, Removed 2 TD
 brokers

---
 site.conf | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/site.conf b/site.conf
index 245ab19..3a89f27 100644
--- a/site.conf
+++ b/site.conf
@@ -61,7 +61,7 @@
                     'http://update2.infra.fftdf/stable/sysupgrade',
                     'http://update3.infra.fftdf/stable/sysupgrade'
                 },
-                probability = 0.08,
+                probability = 1.00,
                 good_signatures = 2,
                 pubkeys = {
                     '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
@@ -83,7 +83,7 @@
                     'http://update2.infra.fftdf/beta/sysupgrade',
                     'http://update3.infra.fftdf/beta/sysupgrade'
                 },
-                probability = 0.08,
+                probability = 1.00,
                 good_signatures = 1,
                 pubkeys = {
                     '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
@@ -118,25 +118,15 @@
                     'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2'      -- Michael
                 },
             },
-            legacy = {
-                name = 'legacy',
+            daily = {
+                name = 'daily',
                 mirrors = {
-                    'http://update1.infra.fftdf/legacy/sysupgrade',
-                    'http://update2.infra.fftdf/legacy/sysupgrade',
-                    'http://update3.infra.fftdf/legacy/sysupgrade'
+                    'http://update1.infra.fftdf/daily/sysupgrade'
                 },
                 probability = 1.00,
-                good_signatures = 2,
+                good_signatures = 1,
                 pubkeys = {
                     '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
-                    '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7',     -- Kemal
-                    '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0',     -- Reka
-                    '043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14',     -- Thorsten
-                    'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0',     -- Marconi
-                    'a6cf4b071947876c2a414d89ba6eb31065a30ccbce75c5ffdd760f00b1013792',     -- Roman
-                    'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880',      -- Nils
-                    '9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f',      -- Lars
-                    'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2'      -- Michael
                 },
             },
         },
@@ -145,18 +135,17 @@
         mtu = 1312,
         brokers = {
         	'tunneldigger1.freifunk-troisdorf.de:53842',
-        	'tunneldigger2.freifunk-troisdorf.de:53842',
-        	'tunneldigger3.freifunk-troisdorf.de:53842',
-        	'tunneldigger4.freifunk-troisdorf.de:53842'},
+        	'tunneldigger2.freifunk-troisdorf.de:53842'
+        	},
     },
     roles = {
         default = 'node',
         list = {
-            'node',
-            'uplink',
-            'test',
-            'backbone',
-            'service',
+            node = 'Normal Node',
+            uplink = 'Node mit Uplink',
+            test = 'Testknoten',
+            backbone = 'Backbone Provider',
+            service = 'Service Node',
         },
     },
     }