update to new ffho-site-generate package

.gitignore

@@ -0,0 +1 @@
+site.conf

extra/default.conf

@@ -0,0 +1,5 @@
+subst = {
+	['%%SN'] = 'Bitte wählen',
+	['%%SC'] = 'ffho',
+	['%%SS'] = 'paderborn.freifunk.net',
+}

extra/sites.conf

@@ -4,151 +4,214 @@
 -- 	site_name = 'Freifunk Hochstift - Paderborn (Umland)',
 --
 --	-- short name of the region
---	site_code = 'ffho_pad',
+--	site_code = 'ffho_pad_uml',
 --
---	-- wifi settings
---	ssid = 'hochstift.freifunk.net/pad-umlnd',
+--	subst = {
+--		-- wifi settings
+--		['%%SS'] = 'hochstift.freifunk.net/pad-umlnd',
+--	},
+--
+--	site-select = {
+--		hidden = 0,
+--		group = 'pad_uml'
+--	},
 --},
 {
 	{
 		site_name = 'Freifunk Hochstift - Altenbeken',
 		site_code = 'ffho_abn',
-		ssid = 'hochstift.freifunk.net/altenbkn',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/altenbkn',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Bad Driburg',
 		site_code = 'ffho_bdr',
-		ssid = 'hochstift.freifunk.net/driburg',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/driburg',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Bad Lippspringe',
 		site_code = 'ffho_rwb',
-		ssid = 'hochstift.freifunk.net/badlippsp',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/badlippsp',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Bad Wünnenberg',
 		site_code = 'ffho_wux',
-		ssid = 'hochstift.freifunk.net/wuennenb',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/wuennenb',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Beverungen',
 		site_code = 'ffho_bev',
-		ssid = 'hochstift.freifunk.net/beverungn',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/beverungn',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Borchen',
 		site_code = 'ffho_rhc',
-		ssid = 'hochstift.freifunk.net/borchen',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/borchen',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Borgentreich',
 		site_code = 'ffho_bxg',
-		ssid = 'hochstift.freifunk.net/borgentr',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/borgentr',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Brakel',
 		site_code = 'ffho_bkk',
-		ssid = 'hochstift.freifunk.net/brakel',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/brakel',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Büren',
 		site_code = 'ffho_buq',
-		ssid = 'hochstift.freifunk.net/bueren',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/bueren',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Delbrück',
 		site_code = 'ffho_dek',
-		ssid = 'hochstift.freifunk.net/delbrueck',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/delbrueck',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Geseke',
 		site_code = 'ffho_gee',
-		ssid = 'hochstift.freifunk.net/geseke',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/geseke',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Horn-Bad Meinberg',
 		site_code = 'ffho_zwg',
-		ssid = 'hochstift.freifunk.net/horn',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/horn',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Hövelhof',
 		site_code = 'ffho_hvf',
-		ssid = 'hochstift.freifunk.net/hoevelhof',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/hoevelhof',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Höxter',
 		site_code = 'ffho_hox',
-		ssid = 'hochstift.freifunk.net/hoexter',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/hoexter',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Lichtenau',
 		site_code = 'ffho_lit',
-		ssid = 'hochstift.freifunk.net/lichtenau',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/lichtenau',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Lippstadt',
 		site_code = 'ffho_lip',
-		ssid = 'hochstift.freifunk.net/lippstadt',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/lippstadt',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Marienmünster',
 		site_code = 'ffho_mms',
-		ssid = 'hochstift.freifunk.net/mms',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/mms',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Marsberg',
 		site_code = 'ffho_msg',
-		ssid = 'hochstift.freifunk.net/marsberg',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/marsberg',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Nieheim',
 		site_code = 'ffho_yni',
-		ssid = 'hochstift.freifunk.net/nieheim',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/nieheim',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Paderborn (Kernstadt)',
 		site_code = 'ffho_pad_cty',
-		ssid = 'hochstift.freifunk.net/pad-city',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/pad-city',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Paderborn (Umland)',
 		site_code = 'ffho_pad_uml',
-		ssid = 'hochstift.freifunk.net/pad-umlnd',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/pad-umlnd',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Salzkotten',
 		site_code = 'ffho_szn',
-		ssid = 'hochstift.freifunk.net/salzkottn',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/salzkottn',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Schieder-Schwalenberg',
 		site_code = 'ffho_yss',
-		ssid = 'hochstift.freifunk.net/schieder',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/schieder',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Schlangen',
 		site_code = 'ffho_xsc',
-		ssid = 'hochstift.freifunk.net/schlangen',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/schlangen',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Steinheim',
 		site_code = 'ffho_stm',
-		ssid = 'hochstift.freifunk.net/steinheim',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/steinheim',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Warburg',
 		site_code = 'ffho_wag',
-		ssid = 'hochstift.freifunk.net/warburg',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/warburg',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Willebadessen',
 		site_code = 'ffho_ywl',
-		ssid = 'hochstift.freifunk.net/willebdn',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/willebdn',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Umland',
 		site_code = 'ffho_yho',
-		ssid = 'hochstift.freifunk.net/umland',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/umland',
+		},
 	},
 	-- start hidden sites here --
 	{
@@ -157,7 +220,9 @@
 		},
 		site_name = 'Freifunk Hochstift - Hamburg',
 		site_code = 'ffho_ham',
-		ssid = 'hochstift.freifunk.net/hamburg',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/hamburg',
+		},
 	},
 
 }

site.conf → extra/template.conf

@@ -6,11 +6,11 @@
 
 	-- name of this site
 	-- site_name = 'Freifunk Hochstift - ${site}',
-	site_name = 'Bitte wählen',
-	
+	site_name = '%SN',
+
 	-- short name of this site
 	-- site_code = 'ffho_${un-code}'
-	site_code = 'ffho',
+	site_code = '%SC',
 
 	-- v4 and v6 prefixes in which nodes+clients might get an IP
 	prefix4 = '10.132.0.0/18',
@@ -45,24 +45,21 @@
 		channel = 1,
 		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
 		basic_rate = {6000, 9000, 18000, 36000, 54000},
-
 		ap = {
 			ssid = 'paderborn.freifunk.net',
 		},
-		
 		ibss = {
 			ssid = '02:d1:11:13:87:ad',
 			bssid = '02:d1:11:13:87:ad',
 			mcast_rate = 12000,
 		},
 	},
+
 	wifi5 = {
 		channel = 44,
-
 		ap = {
 			ssid = 'paderborn.freifunk.net',
 		},
-
 		mesh = {
 			id = 'ffho-mesh-legacy',
 			mcast_rate = 12000,
@@ -96,7 +93,7 @@
 				-- specifies how many servers are contacted
 				-- by a client simultanously
 				limit = 1,
-	
+
 				-- list all available vpn servers
 				peers = {
 					gw01 = {
@@ -173,7 +170,7 @@
 				-- where to get the manifest file (without the trailing /manifest)
 				-- It's wise to use an internal address here,
 				-- but specifying a publicly available update site does not hurt.
-				mirrors = {'http://firmware.srv.in.ffho.net/%GS/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%GS/stable/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/%SC/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/stable/sysupgrade'},
 
 				-- Number of valid manifest signatures necessary to accept the manifest as "good".
 				good_signatures = 3,
@@ -190,7 +187,7 @@
 			},
 			testing = {
 				name = 'testing',
-				mirrors = {'http://firmware.srv.in.ffho.net/%GS/testing/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%GS/testing/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/%SC/testing/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/testing/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
@@ -203,7 +200,7 @@
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://firmware.srv.in.ffho.net/%GS/experimental/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%GS/experimental/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/%SC/experimental/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/experimental/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-

modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffho-packages.git
 PACKAGES_FFHO_BRANCH=v2016.2.x
-PACKAGES_FFHO_COMMIT=5f48f4c97c336df6cdf7c83852f3d223cd893323
+PACKAGES_FFHO_COMMIT=5183706fd8df007b7a656b3a368072910a6c56ce

site.mk

@@ -4,7 +4,7 @@ GLUON_SITE_PACKAGES := \
 	ffho-ap-timer \
 	gluon-respondd \
 	ffho-ath9k-blackout-workaround \
-	ffho-autoupdater \
+	gluon-autoupdater \
 	ffho-autoupdater-wifi-fallback \
 	ffho-autoupdater-wifi-fallback-legacy \
 	ffho-banner \