Adjusted Dockerfile and site.conf for Gluon v2015.1

Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:jessie
 MAINTAINER Markus Lindenberg <markus@lindenberg.io>
 
-ENV GLUON_TAG v2014.4
+ENV GLUON_TAG v2015.1
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_PRIORITY critical

site.conf

@@ -1,5 +1,5 @@
 {
-	hostname_prefix = 'FF-DO',
+	hostname_prefix = 'FF-DO-',
 	site_name = 'Freifunk Dortmund',
 	site_code = 'ffdo',
 	opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
@@ -37,40 +37,42 @@
 	fastd_mesh_vpn = {
 		methods = {'salsa2012+umac'},
 		mtu = 1280,
-		backbone = {
-			limit = 2,
-			peers = {
-				do01100 = {
-					key = '8a334499c905966d48b1cdb01d668b114b17cd6490ead54c6eb5e2d15c1852e4',
-					remotes = {'"node01-1.do.freifunk.ruhr" port 10000'},
-				},
-				do01101 = {
-					key = '6e15fc1d44109f3914e3d72e359263312cf2194199a921f42beb231c93b290b6',
-					remotes = {'"node01-1.do.freifunk.ruhr" port 10001'},
-				},
-				do02100 = {
-					key = '12b94258d16f864c863f7bab07a77514eddffe3ba01c9d4948bd84a192d28f42',
-					remotes = {'"node02-1.do.freifunk.ruhr" port 10000'},
-				},
-				do02101 = {
-					key = '77dc78af0fea243f104a1868999df8a35bdffafac41293ee955b414f51961fc5',
-					remotes = {'"node02-1.do.freifunk.ruhr" port 10001'},
-				},
-				do01200 = {
-					key = 'd2de261203853d14389d80ca004c98d6a67c244bfe4096b7a6f36a0a8484c55a',
-					remotes = {'"node01-2.do.freifunk.ruhr" port 10000'},
-				},
-				do01201 = {
-					key = '84dc27c4581c3536a901dba1f16a5d398a00f39cc8185835213c0279dd0e24eb',
-					remotes = {'"node01-2.do.freifunk.ruhr" port 10001'},
-				},
-				do02200 = {
-					key = '2a0e055aa71e68f2caf09307e8f8c89c22ec36419fb38e089005cc40687e5187',
-					remotes = {'"node02-2.do.freifunk.ruhr" port 10000'},
-				},
-				do02201 = {
-					key = 'fd02c1810f8f9518fe44cbd7b4ccf47574bd8e5086dd4c2c4d22affa53e42d0f',
-					remotes = {'"node02-2.do.freifunk.ruhr" port 10001'},
+		groups = {
+			backbone = {
+				limit = 2,
+				peers = {
+					do01100 = {
+						key = '8a334499c905966d48b1cdb01d668b114b17cd6490ead54c6eb5e2d15c1852e4',
+						remotes = {'"node01-1.do.freifunk.ruhr" port 10000'},
+					},
+					do01101 = {
+						key = '6e15fc1d44109f3914e3d72e359263312cf2194199a921f42beb231c93b290b6',
+						remotes = {'"node01-1.do.freifunk.ruhr" port 10001'},
+					},
+					do02100 = {
+						key = '12b94258d16f864c863f7bab07a77514eddffe3ba01c9d4948bd84a192d28f42',
+						remotes = {'"node02-1.do.freifunk.ruhr" port 10000'},
+					},
+					do02101 = {
+						key = '77dc78af0fea243f104a1868999df8a35bdffafac41293ee955b414f51961fc5',
+						remotes = {'"node02-1.do.freifunk.ruhr" port 10001'},
+					},
+					do01200 = {
+						key = 'd2de261203853d14389d80ca004c98d6a67c244bfe4096b7a6f36a0a8484c55a',
+						remotes = {'"node01-2.do.freifunk.ruhr" port 10000'},
+					},
+					do01201 = {
+						key = '84dc27c4581c3536a901dba1f16a5d398a00f39cc8185835213c0279dd0e24eb',
+						remotes = {'"node01-2.do.freifunk.ruhr" port 10001'},
+					},
+					do02200 = {
+						key = '2a0e055aa71e68f2caf09307e8f8c89c22ec36419fb38e089005cc40687e5187',
+						remotes = {'"node02-2.do.freifunk.ruhr" port 10000'},
+					},
+					do02201 = {
+						key = 'fd02c1810f8f9518fe44cbd7b4ccf47574bd8e5086dd4c2c4d22affa53e42d0f',
+						remotes = {'"node02-2.do.freifunk.ruhr" port 10001'},
+					},
 				},
 			},
 		},