Prepare configuration changes for 2015.2

gluon

@@ -1 +1 @@
-Subproject commit 30677cdc385f44005220ed105619d3a4fa9290ce
+Subproject commit 4405f39869071ebd28fe5e9988a745534d6b3461

site.conf

@@ -17,20 +17,36 @@
 	regdom = 'DE',
 
 	wifi24 = {
-		ssid = 'bremen.freifunk.net',
 		channel = 6,
 		htmode = 'HT20',
-		mesh_ssid = 'mesh.ffhb.de',
-		mesh_bssid = '32:06:1C:1F:B9:E8',
-		mesh_mcast_rate = 6000,
+		ap = {
+			ssid = 'bremen.freifunk.net',
+		},
+		ibss = {
+			ssid = 'adhoc.ffhb.de',
+			bssid = '32:06:1C:1F:B9:E8',
+			mcast_rate = 6000,
+		},
+		mesh = {
+			id = 'mesh.ffhb.de',
+			mcast_rate = 6000,
+		},
 	},
 	wifi5 = {
-		ssid = 'bremen.freifunk.net',
 		channel = 44,
 		htmode = 'HT40+',
-		mesh_ssid = 'mesh.ffhb.de',
-		mesh_bssid = '32:06:1C:1F:B9:E8',
-		mesh_mcast_rate = 6000,
+		ap = {
+			ssid = 'bremen.freifunk.net',
+		},
+		ibss = {
+			ssid = 'adhoc.ffhb.de',
+			bssid = '32:06:1C:1F:B9:E8',
+			mcast_rate = 6000,
+		},
+		mesh = {
+			id = 'mesh.ffhb.de',
+			mcast_rate = 6000,
+		},
 	},
 
 	next_node = {

site.mk

@@ -24,7 +24,6 @@ GLUON_SITE_PACKAGES := \
 	iputils-ping6 \
 	iwinfo \
 	iptables \
-	kmod-ipt-nathelper \
 	firewall \
 	haveged