Merge branch 'master' of github.com:freifunk-gluon/site-ffhl

Conflicts:
	site.conf

site.conf

@@ -177,4 +177,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'],
+	},
 }

site.mk

@@ -1,16 +1,17 @@
 GLUON_SITE_PACKAGES := \
 	gluon-alfred \
+	gluon-autoupdater \
 	gluon-config-mode \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
+	gluon-legacy \
 	gluon-luci-admin \
 	gluon-luci-autoupdater \
 	gluon-next-node \
 	gluon-mesh-batman-adv \
 	gluon-mesh-vpn-fastd \
-	gluon-status-page \
-	gluon-autoupdater \
 	gluon-radvd \
+	gluon-status-page \
 	iwinfo \
 	iptables \
 	haveged