From 378b7534b2bcc4d063777f3b152cd28f37b22f3f Mon Sep 17 00:00:00 2001
From: ohrensessel <git@ohrensessel.net>
Date: Fri, 4 Apr 2014 23:07:49 +0200
Subject: [PATCH] finalize stable config

---
 site.conf | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/site.conf b/site.conf
index f51068d..f8dcad3 100644
--- a/site.conf
+++ b/site.conf
@@ -2,7 +2,7 @@
 	hostname_prefix => 'freifunk',
 	site_name => 'Freifunk Hamburg',
 	site_code => 'ffhh',
-	release => '0.4+0-exp' . nightly,
+	release => '0.4',
 
 	prefix4 => '10.112.0.0/18',
 	prefix6 => 'fd51:2bb2:fd0d::/64',
@@ -131,27 +131,31 @@
 		branches => {
 			stable => {
 				name => 'stable',
-				mirrors => ['http://1.updates.services.ffhh/stable/sysupgrade'],
+				mirrors => ['http://1.updates.services.ffhh/stable/sysupgrade','http://2.updates.services.ffhh/stable/sysupgrade'],
 				probability => 0.08,
 				good_signatures => 2,
 				pubkeys => [
 					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', # baldo
-                                        '', # leo
+                                        'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo
+					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre
+					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', # gernot
 				],
 			},
 			beta => {
                                 name => 'beta',
-                                mirrors => ['http://1.updates.services.ffhh/beta/sysupgrade'],
+                                mirrors => ['http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'],
                                 probability => 0.08,
                                 good_signatures => 2,
                                 pubkeys => [
-                                        '', # baldo
-                                        '', # leo
+                                        '417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', # baldo
+                                        'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo
+					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre
+					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', # gernot
                                 ],      
                         },
 			experimental => {
 				name => 'experimental',
-				mirrors => ['http://1.updates.services.ffhh/experimental/sysupgrade'],
+				mirrors => ['http://1.updates.services.ffhh/experimental/sysupgrade','http://2.updates.services.ffhh/experimental/sysupgrade'],
 				probability => 1.00,
 				good_signatures => 1,
 				pubkeys => [
@@ -165,8 +169,8 @@
 		mesh_vpn => {
 			ifname => 'mesh-vpn',
 			enabled => 0,
-			limit_egress => 200,
-			limit_ingress => 3000,
+			limit_egress => 300,
+			limit_ingress => 4000,
 		},
 	},