From 4176f35b42ded13ae5c6a46f508839d19b256e38 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 10 Mar 2014 20:43:29 +0100
Subject: [PATCH 1/3] Update for lff 0.4beta1

---
 README    |  3 +++
 site.conf | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 0000000..d50a1c8
--- /dev/null
+++ b/README
@@ -0,0 +1,3 @@
+Gluon versions used for specific Lübeck Freifunk Firmware builds:
+
+* 0.3.100-beta1 (0.4 Beta 1): 55a068104fa072ea7cd2decac9584a8f619badbf
diff --git a/site.conf b/site.conf
index 9bf9386..2ec1310 100644
--- a/site.conf
+++ b/site.conf
@@ -2,7 +2,7 @@
 	hostname_prefix => 'freifunk',
 	site_name => 'Freifunk Lübeck',
 	site_code => 'ffhl',
-	release => '0.3.99-exp' . nightly,
+	release => '0.3.100-beta1',
 
 	prefix4 => '10.130.0.0/20',
 	prefix6 => 'fdef:ffc0:3dd7::/64',
@@ -63,11 +63,22 @@
 
 	autoupdater => {
 		enabled => 1,
-		branch => 'experimental',
+		branch => 'beta',
 		branches => {
 			stable => {
 				name => 'stable',
-				mirrors => ['http://1.updates.services.ffhl/stable'],
+				mirrors => ['http://1.updates.services.ffhl/stable/sysupgrade'],
+				probability => 0.08,
+				good_signatures => 2,
+				pubkeys => [
+					'daa19b44bbd7033965e02088127bad9516ba0fea8f34267a777144a23ec8900c', # Linus
+					'a8dd60765b07330a4bbfdf8406102befca132881a4b65f3efda32cf2d5b362d9', # Nils
+					'323bd3285c4e5547a89cd6da1f2aef67f1654b0928bbd5b104efc9dab2156d0b', # NeoRaider
+				],
+			},
+			beta => {
+				name => 'beta',
+				mirrors => ['http://1.updates.services.ffhl/beta/sysupgrade'],
 				probability => 0.08,
 				good_signatures => 2,
 				pubkeys => [

From ef9ea0df0492a43a0d313484d5af0735a1760b87 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 10 Mar 2014 20:54:56 +0100
Subject: [PATCH 2/3] Experimental version, again

---
 site.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site.conf b/site.conf
index 2ec1310..cf99dea 100644
--- a/site.conf
+++ b/site.conf
@@ -2,7 +2,7 @@
 	hostname_prefix => 'freifunk',
 	site_name => 'Freifunk Lübeck',
 	site_code => 'ffhl',
-	release => '0.3.100-beta1',
+	release => '0.3.101-exp' . nightly,
 
 	prefix4 => '10.130.0.0/20',
 	prefix6 => 'fdef:ffc0:3dd7::/64',
@@ -63,7 +63,7 @@
 
 	autoupdater => {
 		enabled => 1,
-		branch => 'beta',
+		branch => 'experimental',
 		branches => {
 			stable => {
 				name => 'stable',

From 145375f864de39af8248c2670dec797a46a3db96 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 11 Mar 2014 20:46:16 +0100
Subject: [PATCH 3/3] Change version numbers to 0.3.990-* to handle version
 comparision bug in the autoupdater

---
 site.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site.conf b/site.conf
index cf99dea..a28dd22 100644
--- a/site.conf
+++ b/site.conf
@@ -2,7 +2,7 @@
 	hostname_prefix => 'freifunk',
 	site_name => 'Freifunk Lübeck',
 	site_code => 'ffhl',
-	release => '0.3.101-exp' . nightly,
+	release => '0.3.990-exp' . nightly,
 
 	prefix4 => '10.130.0.0/20',
 	prefix6 => 'fdef:ffc0:3dd7::/64',