From 6a73a2e1ce292c25de88e0766d72ab273425f6d2 Mon Sep 17 00:00:00 2001
From: bdobe <bdobe@users.noreply.github.com>
Date: Sun, 14 Jun 2015 18:55:56 +0200
Subject: [PATCH] Remove support for upgrading legacy nodes

Directly upgrade from pre-gluon notes is no longer supported.

This commit also cleans some white spaces.
---
 site.conf | 29 ++++++++++-------------------
 site.mk   |  5 ++---
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/site.conf b/site.conf
index 8b8fbbe..4391c72 100644
--- a/site.conf
+++ b/site.conf
@@ -19,6 +19,7 @@
 		mesh_bssid = 'f8:d1:11:87:52:2e',
 		mesh_mcast_rate = 12000,
 	},
+
 	wifi5 = {
 		ssid = 'hamburg.freifunk.net',
 		channel = 44,
@@ -93,22 +94,22 @@
 				good_signatures = 2,
 				pubkeys = {
 					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
-                                        'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
+					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
 					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
 					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
 				},
 			},
 			beta = {
-                                name = 'beta',
-                                mirrors = {'http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'},
-                                good_signatures = 2,
-                                pubkeys = {
-                                        '417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
-                                        'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
+				name = 'beta',	
+				mirrors = {'http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'},
+				good_signatures = 2,
+				pubkeys = {
+					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
+					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
 					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
 					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
-                                },      
-                        },
+				},
+			},
 			experimental = {
 				name = 'experimental',
 				mirrors = {'http://1.updates.services.ffhh/experimental/sysupgrade','http://2.updates.services.ffhh/experimental/sysupgrade'},
@@ -129,14 +130,4 @@
 		},
 	},
 
-	legacy = {
-	       version_files = {'/etc/.freifunk_version_keep'},
-	       old_files = {'/etc/config/config_mode', '/etc/config/freifunk'},
-
-	       config_mode_configs = {'config_mode.@wizard{0}', 'freifunk.@wizard{0}'},
-	       fastd_configs = {'mesh_vpn'},
-	       mesh_ifname = 'freifunk',
-	       tc_configs = {'freifunk.@bandwidth{0}'},
-	       wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
-	},
 }
diff --git a/site.mk b/site.mk
index c7fedc3..1336177 100644
--- a/site.mk
+++ b/site.mk
@@ -4,13 +4,12 @@ GLUON_SITE_PACKAGES := \
 	gluon-announced \
 	gluon-autoupdater \
 	gluon-config-mode-autoupdater \
-        gluon-config-mode-core \
+	gluon-config-mode-core \
 	gluon-config-mode-hostname \
 	gluon-config-mode-mesh-vpn \
 	gluon-config-mode-reboot-ffhh \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
-	gluon-legacy \
 	gluon-luci-admin \
 	gluon-luci-autoupdater \
 	gluon-luci-portconfig \
@@ -18,7 +17,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-next-node \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
-        gluon-setup-mode \
+	gluon-setup-mode \
 	gluon-status-page \
 	iwinfo \
 	iptables \