From 253bfcd92909182792b6ead74754e364c5045ee9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 11 Feb 2014 00:39:02 +0100
Subject: [PATCH 1/4] Change version string from experimental to exp

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

diff --git a/site.conf b/site.conf
index 38d4ea6..24d37cd 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-experimental' . nightly,
+	release => '0.3.99-exp' . nightly,
 
 	prefix4 => '10.130.0.0/20',
 	prefix6 => 'fdef:ffc0:3dd7::/64',

From 7f369ff4e794df5a49f0f6651218d19ba9e82d16 Mon Sep 17 00:00:00 2001
From: Nils Schneider <nils@nilsschneider.net>
Date: Tue, 11 Feb 2014 14:47:06 +0100
Subject: [PATCH 2/4] add experimental branch and make it default

---
 site.conf | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/site.conf b/site.conf
index 24d37cd..0b7d151 100644
--- a/site.conf
+++ b/site.conf
@@ -63,7 +63,7 @@
 
 	autoupdater => {
 		enabled => 1,
-		branch => 'stable',
+		branch => 'experimental',
 		branches => {
 			stable => {
 				name => 'stable',
@@ -76,6 +76,15 @@
 					'323bd3285c4e5547a89cd6da1f2aef67f1654b0928bbd5b104efc9dab2156d0b', # NeoRaider
 				],
 			},
+			experimental => {
+				name => 'experimental',
+				mirrors => ['http://1.updates.services.ffhl/experimental/sysupgrade'],
+				probability => 1.00,
+				good_signatures => 1,
+				pubkeys => [
+					'496136b37e5f561dfdf523611f14e4b6bc2a745cbc1ab7daffa59fded5f202d1', # philae
+				],
+			},
 		},
 	},
 

From 7a3dbaf508f9ccda65d8c5b118b26bd2acaedbe0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 21 Feb 2014 19:22:00 +0100
Subject: [PATCH 3/4] Sort gluon packages

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

diff --git a/site.mk b/site.mk
index cb6581b..135cf53 100644
--- a/site.mk
+++ b/site.mk
@@ -1,5 +1,6 @@
 GLUON_SITE_PACKAGES := \
 	gluon-alfred \
+	gluon-autoupdater \
 	gluon-config-mode \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
@@ -8,9 +9,8 @@ GLUON_SITE_PACKAGES := \
 	gluon-next-node \
 	gluon-mesh-batman-adv \
 	gluon-mesh-vpn-fastd \
-	gluon-status-page \
-	gluon-autoupdater \
 	gluon-radvd \
+	gluon-status-page \
 	iwinfo \
 	iptables \
 	haveged

From 072d645f7ea40fe231639dee50d33354d804b62e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 22 Feb 2014 08:40:07 +0100
Subject: [PATCH 4/4] Add legacy upgrade support

---
 site.conf | 11 +++++++++++
 site.mk   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/site.conf b/site.conf
index 0b7d151..9bf9386 100644
--- a/site.conf
+++ b/site.conf
@@ -124,4 +124,15 @@ Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!
 </p>
 END
 	},
+
+	legacy => {
+	       version_files => ['/etc/.freifunk_version_keep', '/etc/.lff_version_keep'],
+	       old_files => ['/etc/config/config_mode', '/etc/config/ffhl', '/etc/config/freifunk'],
+
+	       config_mode_configs => ['config_mode.@wizard[0]', 'ffhl.@wizard[0]', 'freifunk.@wizard[0]'],
+	       fastd_configs => ['ffhl_mesh_vpn', 'mesh_vpn'],
+	       mesh_ifname => 'freifunk',
+	       tc_configs => ['ffhl.@bandwidth[0]', 'freifunk.@bandwidth[0]'],
+	       wifi_names => ['wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'],
+	},
 }
diff --git a/site.mk b/site.mk
index 135cf53..53b5124 100644
--- a/site.mk
+++ b/site.mk
@@ -4,6 +4,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
+	gluon-legacy \
 	gluon-luci-admin \
 	gluon-luci-autoupdater \
 	gluon-next-node \