Update modules and site.conf templates for gluon 2018.1.x

extra/default.conf

@@ -7,4 +7,5 @@ subst = {
 	['%%V4'] = '10.132.112.0/21',
 	['%%V6'] = 'a00',
 	['%%N4'] = '10.132.112.1',
+	['%%DS'] = '6fdb7c99404fe91fca18e84bf48864681018741dc33fb6bde67d6041fc99210c',
 }

extra/groups.conf

@@ -5,6 +5,7 @@
 			['%%V4'] = '10.132.32.0/20',
 			['%%V6'] = '100',
 			['%%N4'] = '10.132.32.1',
+			['%%DS'] = '346fe028635137fa012d2e7ef4c30c1998d988636d358c929559616e24f4f6bc',
 		},
 	},
 	pad_uml = {
@@ -13,6 +14,7 @@
 			['%%V4'] = '10.132.48.0/21',
 			['%%V6'] = '200',
 			['%%N4'] = '10.132.48.1',
+			['%%DS'] = '4d6ebfb6c5ac1507a7a9bd4b40c1e84f7f750db29a33ca721009f3d0e9b1569e',
 		},
 	},
 	buq = {
@@ -21,6 +23,7 @@
 			['%%V4'] = '10.132.56.0/21',
 			['%%V6'] = '300',
 			['%%N4'] = '10.132.56.1',
+			['%%DS'] = 'f57ae6294491f9b58cf2183dda44927a0b33f825156da68b05302dd8a0cc08b6',
 		},
 	},
 	pb_nord = {
@@ -29,6 +32,7 @@
 			['%%V4'] = '10.132.64.0/21',
 			['%%V6'] = '400',
 			['%%N4'] = '10.132.64.1',
+			['%%DS'] = '59452bf36c5614022c54fe9f5b4a0012da07a25d455b99079db0758b2fd748c8',
 		},
 	},
 	pb_ost = {
@@ -37,6 +41,7 @@
 			['%%V4'] = '10.132.72.0/21',
 			['%%V6'] = '500',
 			['%%N4'] = '10.132.72.1',
+			['%%DS'] = 'ff018701d9378be833e6bcd2b38791f785cdeb41dcfa15255069d83a090f7a60',
 		},
 	},
 	pb_sued = {
@@ -45,6 +50,7 @@
 			['%%V4'] = '10.132.80.0/21',
 			['%%V6'] = '600',
 			['%%N4'] = '10.132.80.1',
+			['%%DS'] = '23598bf0196a7650428717c5ecd4cf6f3062271ed1020c86711176adffbcdc3b',
 		},
 	},
 	pb_west = {
@@ -53,6 +59,7 @@
 			['%%V4'] = '10.132.88.0/21',
 			['%%V6'] = '700',
 			['%%N4'] = '10.132.88.1',
+			['%%DS'] = '1b8bed9940f072b2ad3ab51a97868c4f4346d73d7a7e41fee5954f0f67905e0c',
 		},
 	},
 	hx_nord = {
@@ -61,6 +68,7 @@
 			['%%V4'] = '10.132.96.0/21',
 			['%%V6'] = '800',
 			['%%N4'] = '10.132.96.1',
+			['%%DS'] = 'a98d1fdc66bf8b952937183edf9d8a581ee375c09f30eb902deecea5d4036b1a',
 		},
 	},
 	hx_sued = {
@@ -69,6 +77,7 @@
 			['%%V4'] = '10.132.104.0/21',
 			['%%V6'] = '900',
 			['%%N4'] = '10.132.104.1',
+			['%%DS'] = '936f9b7ec3988901fc9f314958e923e9af7ac1f47234df27cc5fc5305ab973c0',
 		},
 	},
 	uml = {
@@ -77,6 +86,7 @@
 			['%%V4'] = '10.132.112.0/21',
 			['%%V6'] = 'a00',
 			['%%N4'] = '10.132.112.1',
+			['%%DS'] = '47ab039f19c4865701a4d4f5123109ee4c340808b03d1261e596283206b2ebc2',
 		},
 	},
 }

extra/template.conf

@@ -12,6 +12,13 @@
 	-- site_code = 'ffho_${un-code}'
 	site_code = '%SC',
 
+	-- 32 bytes of random data, encoded in hexadecimal, used to seed other 
+	-- random values specific to the mesh domain. It must be the same for all 
+	-- nodes of one mesh, but should be different for firmwares that are not 
+	-- supposed to mesh with each other.
+	-- TODO: Must be set individual by any domain
+	domain_seed = '%DS',
+
 	-- v4 and v6 prefixes in which nodes+clients might get an IP
 	prefix4 = '%V4',
 	prefix6 = '2a03:2260:2342:%V6::/64',
@@ -33,6 +40,11 @@
 	-- regulatory domain of your wifi
 	regdom = 'DE',
 
+	mesh = {
+		-- for now, we don't use vxlan on the mesh
+		vxlan = false,
+	},
+
 	-- wifi settings (2.4 GHz and 5 GHz)
 	-- ap.ssid = 'hochstift.freifunk.net/${kürzel}',
 	-- mesh.id = 'ffho-mesh-${group-name}',
@@ -67,7 +79,7 @@
 	next_node = {
 		ip4 = '%N4',
 		ip6 = '2a03:2260:2342:%V6::1',
-		name = 'node.ffho.net',
+		name = { 'node.ffho.net' },
 
 		-- mac address, must be unique in the client network
 		-- (usually, you don't need to change this)

modules

@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=https://git.ffho.net/freifunkhochstift/ffho-packages.git
-PACKAGES_FFHO_BRANCH=v2017.1.x
-PACKAGES_FFHO_COMMIT=806f98a8f4bc0896ba29b903a8b9f72c39db2f09
+PACKAGES_FFHO_BRANCH=master
+PACKAGES_FFHO_COMMIT=ca4cc1b87e47d3aba2e6af4ec725ec0f7f6abde3