Merge branch 'testing' into stable

extra/default.conf

@@ -1,5 +1,10 @@
 subst = {
 	['%%SN'] = 'Bitte wählen',
 	['%%SC'] = 'ffho',
-	['%%SS'] = 'paderborn.freifunk.net',
+	['%%GN'] = 'uml',
+	['%%ID'] = '10',
+	['%%SS'] = 'hochstift.freifunk.net/default',
+	['%%V4'] = '10.132.112.0/21',
+	['%%V6'] = 'a00',
+	['%%N4'] = '10.132.112.1',
 }

extra/groups.conf

@@ -0,0 +1,82 @@
+{
+	pad_cty = {
+		subst = {
+			['%%ID'] = '01',
+			['%%V4'] = '10.132.32.0/20',
+			['%%V6'] = '100',
+			['%%N4'] = '10.132.32.1',
+		},
+	},
+	pad_uml = {
+		subst = {
+			['%%ID'] = '02',
+			['%%V4'] = '10.132.48.0/21',
+			['%%V6'] = '200',
+			['%%N4'] = '10.132.48.1',
+		},
+	},
+	buq = {
+		subst = {
+			['%%ID'] = '03',
+			['%%V4'] = '10.132.56.0/21',
+			['%%V6'] = '300',
+			['%%N4'] = '10.132.56.1',
+		},
+	},
+	pb_nord = {
+		subst = {
+			['%%ID'] = '04',
+			['%%V4'] = '10.132.64.0/21',
+			['%%V6'] = '400',
+			['%%N4'] = '10.132.64.1',
+		},
+	},
+	pb_ost = {
+		subst = {
+			['%%ID'] = '05',
+			['%%V4'] = '10.132.72.0/21',
+			['%%V6'] = '500',
+			['%%N4'] = '10.132.72.1',
+		},
+	},
+	pb_sued = {
+		subst = {
+			['%%ID'] = '06',
+			['%%V4'] = '10.132.80.0/21',
+			['%%V6'] = '600',
+			['%%N4'] = '10.132.80.1',
+		},
+	},
+	pb_west = {
+		subst = {
+			['%%ID'] = '07',
+			['%%V4'] = '10.132.88.0/21',
+			['%%V6'] = '700',
+			['%%N4'] = '10.132.88.1',
+		},
+	},
+	hx_nord = {
+		subst = {
+			['%%ID'] = '08',
+			['%%V4'] = '10.132.96.0/21',
+			['%%V6'] = '800',
+			['%%N4'] = '10.132.96.1',
+		},
+	},
+	hx_sued = {
+		subst = {
+			['%%ID'] = '09',
+			['%%V4'] = '10.132.104.0/21',
+			['%%V6'] = '900',
+			['%%N4'] = '10.132.104.1',
+		},
+	},
+	uml = {
+		subst = {
+			['%%ID'] = '10',
+			['%%V4'] = '10.132.112.0/21',
+			['%%V6'] = 'a00',
+			['%%N4'] = '10.132.112.1',
+		},
+	},
+}

extra/sites.conf

@@ -11,7 +11,7 @@
 --		['%%SS'] = 'hochstift.freifunk.net/pad-umlnd',
 --	},
 --
---	site-select = {
+--	site_select = {
 --		hidden = 0,
 --		group = 'pad_uml'
 --	},
@@ -23,6 +23,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/altenbkn',
 		},
+		site_select = {
+			group = 'pb_ost',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Bad Driburg',
@@ -30,6 +33,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/driburg',
 		},
+		site_select = {
+			group = 'hx_nord',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Bad Lippspringe',
@@ -37,6 +43,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/badlippsp',
 		},
+		site_select = {
+			group = 'pb_nord',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Bad Wünnenberg',
@@ -44,6 +53,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/wuennenb',
 		},
+		site_select = {
+			group = 'pb_sued',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Beverungen',
@@ -51,6 +63,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/beverungn',
 		},
+		site_select = {
+			group = 'hx_sued',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Borchen',
@@ -58,6 +73,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/borchen',
 		},
+		site_select = {
+			group = 'pb_sued',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Borgentreich',
@@ -65,6 +83,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/borgentr',
 		},
+		site_select = {
+			group = 'hx_sued',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Brakel',
@@ -72,6 +93,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/brakel',
 		},
+		site_select = {
+			group = 'hx_nord',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Büren',
@@ -79,6 +103,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/bueren',
 		},
+		site_select = {
+			group = 'buq',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Delbrück',
@@ -86,6 +113,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/delbrueck',
 		},
+		site_select = {
+			group = 'pb_west',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Geseke',
@@ -93,6 +123,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/geseke',
 		},
+		site_select = {
+			group = 'uml',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Horn-Bad Meinberg',
@@ -100,6 +133,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/horn',
 		},
+		site_select = {
+			group = 'uml',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Hövelhof',
@@ -107,6 +143,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/hoevelhof',
 		},
+		site_select = {
+			group = 'pb_west',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Höxter',
@@ -114,6 +153,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/hoexter',
 		},
+		site_select = {
+			group = 'hx_nord',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Lichtenau',
@@ -121,6 +163,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/lichtenau',
 		},
+		site_select = {
+			group = 'pb_sued',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Lippstadt',
@@ -128,6 +173,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/lippstadt',
 		},
+		site_select = {
+			group = 'uml',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Marienmünster',
@@ -135,6 +183,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/mms',
 		},
+		site_select = {
+			group = 'hx_nord',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Marsberg',
@@ -142,6 +193,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/marsberg',
 		},
+		site_select = {
+			group = 'uml',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Nieheim',
@@ -149,6 +203,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/nieheim',
 		},
+		site_select = {
+			group = 'hx_nord',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Paderborn (Kernstadt)',
@@ -156,6 +213,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/pad-city',
 		},
+		site_select = {
+			group = 'pad_cty',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Paderborn (Umland)',
@@ -163,6 +223,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/pad-umlnd',
 		},
+		site_select = {
+			group = 'pad_uml',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Salzkotten',
@@ -170,6 +233,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/salzkottn',
 		},
+		site_select = {
+			group = 'pad_west',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Schieder-Schwalenberg',
@@ -177,6 +243,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/schieder',
 		},
+		site_select = {
+			group = 'uml',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Schlangen',
@@ -184,6 +253,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/schlangen',
 		},
+		site_select = {
+			group = 'pb_nord',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Steinheim',
@@ -191,6 +263,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/steinheim',
 		},
+		site_select = {
+			group = 'hx_nord',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Warburg',
@@ -198,6 +273,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/warburg',
 		},
+		site_select = {
+			group = 'hx_sued',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Willebadessen',
@@ -205,6 +283,9 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/willebdn',
 		},
+		site_select = {
+			group = 'hx_sued',
+		},
 	},
 	{
 		site_name = 'Freifunk Hochstift - Umland',
@@ -212,17 +293,20 @@
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/umland',
 		},
+		site_select = {
+			group = 'uml',
+		},
 	},
 	-- start hidden sites here --
 	{
-		site_select = {
-			hidden = 1,
-		},
 		site_name = 'Freifunk Hochstift - Hamburg',
 		site_code = 'ffho_ham',
 		subst = {
 			['%%SS'] = 'hochstift.freifunk.net/hamburg',
 		},
+		site_select = {
+			hidden = 1,
+			group = 'uml',
+		},
 	},
-
 }

extra/template.conf

@@ -13,21 +13,18 @@
 	site_code = '%SC',
 
 	-- v4 and v6 prefixes in which nodes+clients might get an IP
-	prefix4 = '10.132.0.0/19',
-	prefix6 = 'fdca:ffee:ff12:132::/64',
-
-	-- extra ipv6 prefixes used in this mesh area
-	additional_prefix6 = { '2001:470:6d:860::/64', '2a03:2260:2342::/64', },
+	prefix4 = '%V4',
+	prefix6 = '2a03:2260:2342:%V6::/64',
 
 	-- timezone
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 
 	-- network-internal ntp service
-	ntp_servers = {'ntp.in.ffho.net'},
+	ntp_servers = {'ntp.srv.in.ffho.net'},
 
 	-- OpenWRT Package Repository (IPv6 capable)
 	opkg = {
-		openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+		openwrt = 'http://firmware.srv.in.ffho.net/openwrt/%n/%v/%S/packages',
 		extra = {
 			modules = 'http://firmware.srv.in.ffho.net/%GR/modules/%S',
 		},
@@ -38,19 +35,16 @@
 
 	-- wifi settings (2.4 GHz and 5 GHz)
 	-- ap.ssid = 'hochstift.freifunk.net/${kürzel}',
-	-- ibss.ssid = 'ffho-mesh-${un-code}',
-	-- ibss.bssid = '${idividual-mac}'
-	-- mesh.id = 'ffho-mesh-${un-code}',
+	-- mesh.id = 'ffho-mesh-${group-name}',
 	wifi24 = {
 		channel = 1,
 		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
 		basic_rate = {6000, 9000, 18000, 36000, 54000},
 		ap = {
-			ssid = 'paderborn.freifunk.net',
+			ssid = '%SS',
 		},
-		ibss = {
-			ssid = '02:d1:11:13:87:ad',
-			bssid = '02:d1:11:13:87:ad',
+		mesh = {
+			id = 'ffho-mesh-%GN',
 			mcast_rate = 12000,
 		},
 	},
@@ -58,10 +52,10 @@
 	wifi5 = {
 		channel = 44,
 		ap = {
-			ssid = 'paderborn.freifunk.net',
+			ssid = '%SS',
 		},
 		mesh = {
-			id = 'ffho-mesh-legacy',
+			id = 'ffho-mesh-%GN',
 			mcast_rate = 12000,
 		},
 	},
@@ -71,12 +65,12 @@
 	-- currently connected node. Both v4 and v6 addr.
 	-- must lie in the above prefix4 and prefix6.
 	next_node = {
-		ip4 = '10.132.0.1',
-		ip6 = 'fdca:ffee:ff12:132::1',
+		ip4 = '%N4',
+		ip6 = '2a03:2260:2342:%V6::1',
 
 		-- mac address, must be unique in the client network
 		-- (usually, you don't need to change this)
-		mac = '16:41:95:40:f7:dc',
+		mac = 'f2:ff:ff:%ID:ff:ff',
 	},
 
 	-- fastd (vpn) settings
@@ -85,7 +79,6 @@
 		methods = {'salsa2012+umac'},
 
 		-- the maximum transfer unit
-		-- use 1426 for IPv4 gateways
 		mtu = 1406,
 
 		groups = {
@@ -103,45 +96,46 @@
 						-- Use public addresses here, these addresses are used when the mesh might not be connected yet.
 						-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
 						remotes = {
-							'"gw01.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a01:4f8:190:2105::ff12" port 10000',
-							'ipv4 "85.10.248.243" port 10000',
+							'"gw01.ffho.net" port 100%ID',
 						},
 					},
 					gw02 = {
 						key = 'e8fa9bf402fd33dd1ba804a97f2e46c704423ff49e9c55312845a7bfb93121ad',
 						remotes = {
-							'"gw02.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a01:4f8:190:6500::18:1" port 10000',
-							'ipv4 "78.46.242.24" port 10000',
+							'"gw02.ffho.net" port 100%ID',
+							'ipv6 "2a01:4f8:190:6500::18:1" port 100%ID',
+							'ipv4 "78.46.242.24" port 100%ID',
 						},
 					},
 					gw03 = {
 						key = '629b2742922f068ef49558283aea4b75c1427d8cdd3fcd2dbd7c00880547d3b3',
-						remotes = { '"gw03.ffho.net" port 10000'},
+						remotes = {
+							'"gw03.ffho.net" port 100%ID',
+							'ipv6 "2a00:13c8:1000:2::165" port 100%ID',
+							'ipv4 "185.46.137.165" port 100%ID',
+						},
 					},
 					gw04 = {
 						key = 'cf3855e5fa04e4c04a294cb6e8902f91c7ff7ef82bf031cc842a2b79b936677c',
 						remotes = {
-							'"gw04.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a02:450:1:4::10" port 10000',
-							'ipv4 "80.70.181.57" port 10000',
+							'"gw04.ffho.net" port 100%ID',
+							'ipv6 "2a02:450:1::22" port 100%ID',
+							'ipv4 "80.70.181.63" port 100%ID',
 						},
 					},
 					gw05 = {
 						key = 'd0d32a2f536a0fc1f0c848e6da15bd96851d5ff4fdf9239c830bab033ddcec1a',
 						remotes = {
-							'"gw05.paderborn.freifunk.net" port 10000',
-							'ipv6 "2001:638:502:1884::ff05" port 10000',
-							'ipv4 "192.26.175.182" port 10000',
+							'"gw05.ffho.net" port 100%ID',
+							'ipv6 "2001:638:502:1884::ff15" port 100%ID',
+							'ipv4 "192.26.175.183" port 100%ID',
 						},
 					},
-					gw08 = {
-						key = '3da050bbf1c3e95af286af65553f546fd563d9cb5d4b3b3444069bef281de621',
+					gw06 = {
+						key = '88b570c4cc811259b7c4106943098c9bee1126d692ddacedd23cd48efc28b0bf',
 						remotes = {
-							'"gw08.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a03:4000:6:1151::ff12" port 10000',
-							'ipv4 "5.45.107.59" port 10000',
+							'"gw06.ffho.net" port 100%ID',
+							'ipv4 "5.196.106.54" port 100%ID',
 						},
 					},
 				},

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=4d8cb845f98690186c907b1099a86e742ed4dfc8
+PACKAGES_FFHO_COMMIT=b4924e41bb3622b57e7ab8514dacbaa1d1133c45

site.mk

@@ -1,6 +1,5 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-14 \
-	gluon-alfred \
+	gluon-mesh-batman-adv-15 \
 	ffho-ap-timer \
 	gluon-respondd \
 	ffho-ath9k-blackout-workaround \
@@ -28,7 +27,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-mesh-vpn-fastd \
 	gluon-next-node \
 	gluon-radvd \
-	ffho-respondd-config \
 	gluon-setup-mode \
 	ffho-site-auto-select \
 	ffho-status-page \
@@ -63,7 +61,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 0.7.4~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.0.0~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)