From a6100cb99ec4b5ead9f30aed0b805303b616d587 Mon Sep 17 00:00:00 2001
From: Jan-Philipp Litza <janphilipp@litza.de>
Date: Tue, 21 Jan 2014 13:55:51 +0100
Subject: [PATCH] add new settings needed for new firmware

---
 site.conf | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/site.conf b/site.conf
index 72f5935..7ed1851 100644
--- a/site.conf
+++ b/site.conf
@@ -1,12 +1,16 @@
 {
 	hostname_prefix => 'ffhb',
+	site_name => 'Freifunk Bremen',
 	site_code => 'ffhb',
 	release => '0.0',
 
 	prefix4 => '10.196.0.0/20',
 	prefix6 => 'fd2f:5119:0f2c::/64',
 
+	mesh_domains => [ 'ffhb', '196.10.in-addr.arpa', 'c.2.f.0.9.1.1.5.f.2.d.f.ip6.arpa' ],
+
 	timezone => 'CET-1CEST,M3.5.0,M10.5.0/3', # Europe/Berlin
+	ntp_servers => ['1.ntp.services.ffhb'],
 	regdom => 'DE',
 
 	wifi24 => {
@@ -49,7 +53,8 @@
 		branch => 'testing',
 		branches => {
 			nightly => {
-				url => 'http://[fd2f:5119:0f2c::1]/firmware/nightly/',
+				name => 'nightly',
+				mirrors => ['http://[fd2f:5119:0f2c::1]/firmware/nightly', 'http://[fd2f:5119:0f2c::2]/firmware/nightly'],
 				probability => 1,
 				good_signatures => 1,
 				pubkeys => [
@@ -57,7 +62,8 @@
 				],
 			},
 			testing => {
-				url => 'http://[fd2f:5119:0f2c::1]/firmware/testing/',
+				name => 'testing',
+				mirrors => ['http://[fd2f:5119:0f2c::1]/firmware/testing', 'http://[fd2f:5119:0f2c::2]/firmware/testing'],
 				probability => 0.5,
 				good_signatures => 1,
 				pubkeys => [
@@ -66,7 +72,8 @@
 				],
 			},
 			stable => {
-				url => 'http://[fd2f:5119:0f2c::1]/firmware/stable/',
+				name => 'stable',
+				mirrors => ['http://[fd2f:5119:0f2c::1]/firmware/stable', 'http://[fd2f:5119:0f2c::2]/firmware/stable'],
 				probability => 0.08, # mean time until update: ~12.5 hours (1/0.08)
 				good_signatures => 2,
 				pubkeys => [