Add initial site configuration for Dortmund

site.conf

@@ -4,19 +4,19 @@
 	site_code = 'ffdo',
 	opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
 
-	prefix4 = '10.53.0.0/16',
-	prefix6 = '2a03:2260:50:1::/64',
+	prefix4 = '10.233.0.0/16',
+	prefix6 = '2a03:2260:50:5::/64',
 
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	ntp_servers = {'1.ntp.services.ffdo','2.ntp.services.ffdo'},
-	regdom = 'US',
+	ntp_servers = {'1.ntp.services.ffdo.de','2.ntp.services.ffdo.de','3.ntp.services.ffdo.de', '4.ntp.services.ffdo.de'},
+	regdom = 'DE',
 
 	wifi24 = {
 		ssid = 'Freifunk',
-		channel = 3,
+		channel = 1,
 		htmode = 'HT40+',
 		mesh_ssid = 'wifimesh-dortmund',
-		mesh_bssid = '02:ff:13:37:ff:01',
+		mesh_bssid = '02:ff:d0:09:ff:01',
 		mesh_mcast_rate = 12000,
 	},
 	wifi5 = {
@@ -24,69 +24,53 @@
 		channel = 44,
 		htmode = 'HT40+',
 		mesh_ssid = 'wifimesh-dortmund5',
-		mesh_bssid = '02:ff:13:37:ff:02',
+		mesh_bssid = '02:ff:d0:09:ff:02',
 		mesh_mcast_rate = 12000,
 	},
 
 	next_node = {
-		ip4 = '10.53.254.254',
-		ip6 = '2a03:2260:50:1::cafe',
+		ip4 = '10.233.254.254',
+		ip6 = '2a03:2260:50:5::cafe',
 		mac = '16:41:95:40:f7:dc',
 	},
 
 	fastd_mesh_vpn = {
-		methods = {'salsa2012+umac', 'salsa2012+gmac'},
-		mtu = 1426,
+		methods = {'salsa2012+umac'},
+		mtu = 1280,
 		backbone = {
 			limit = 2,
 			peers = {
-				ruhrgebiet0 = {
-					key = 'b99ecd9663126a8036d9e9990df7110318567b6cfa06652e55de853a6384fb6a',
-					remotes = {'ipv4 "ffrg0.freifunk-ruhrgebiet.de" port 10000'},
+				do01100 = {
+					key = '8a334499c905966d48b1cdb01d668b114b17cd6490ead54c6eb5e2d15c1852e4',
+					remotes = {'"node01-1.do.freifunk.ruhr" port 10000'},
 				},
-				ruhrgebiet1 = {
-					key = '15e1601791c201e463ca404ae9174f937859346ef1b7311a3e9eebf02fe6ebbe',
-					remotes = {'ipv4 "ffrg1.freifunk-ruhrgebiet.de" port 10000'},
+				do01101 = {
+					key = '6e15fc1d44109f3914e3d72e359263312cf2194199a921f42beb231c93b290b6',
+					remotes = {'"node01-1.do.freifunk.ruhr" port 10001'},
 				},
-				ruhrgebiet2 = {
-					key = '975e713ba967c20a8812a0f51d741a787b7258c5b58845d812cda845f825f6a1',
-					remotes = {'ipv4 "ffrg2.freifunk-ruhrgebiet.de" port 10000'},
+				do02100 = {
+					key = '12b94258d16f864c863f7bab07a77514eddffe3ba01c9d4948bd84a192d28f42',
+					remotes = {'"node02-1.do.freifunk.ruhr" port 10000'},
 				},
-				ruhrgebiet3 = {
-					key = 'f82b1d93c1719dc9cd5785437aebe004014c94820b2aa26759f2b1c0bd7b2f6c',
-					remotes = {'ipv4 "ffrg3.freifunk-ruhrgebiet.de" port 10000'},
+				do02101 = {
+					key = '77dc78af0fea243f104a1868999df8a35bdffafac41293ee955b414f51961fc5',
+					remotes = {'"node02-1.do.freifunk.ruhr" port 10001'},
 				},
-				ruhrgebiet4 = {
-					key = '1dd1997f2348f0cee5ffe51a8be5be3d2088eb150e73a35a8810cfa768afbb0c',
-					remotes = {'ipv4 "ffrg4.freifunk-ruhrgebiet.de" port 10000'},
+				do01200 = {
+					key = 'd2de261203853d14389d80ca004c98d6a67c244bfe4096b7a6f36a0a8484c55a',
+					remotes = {'"node01-2.do.freifunk.ruhr" port 10000'},
 				},
-				ruhrgebiet5 = {
-					key = 'bce9b44a466c2184db80ce36e677d86fb4d61f14be524b1e844615b1dcabb8d8',
-					remotes = {'ipv4 "ffrg5.freifunk-ruhrgebiet.de" port 10000'},
+				do01201 = {
+					key = '84dc27c4581c3536a901dba1f16a5d398a00f39cc8185835213c0279dd0e24eb',
+					remotes = {'"node01-2.do.freifunk.ruhr" port 10001'},
 				},
-				ruhrgebiet6 = {
-					key = 'e58826f3b6d8286e1b4fe278b1fb74646cfcfe655d3cbd573796a83a8382a49f',
-					remotes = {'ipv4 "ffrg6.freifunk-ruhrgebiet.de" port 10000'},
+				do02200 = {
+					key = '2a0e055aa71e68f2caf09307e8f8c89c22ec36419fb38e089005cc40687e5187',
+					remotes = {'"node02-2.do.freifunk.ruhr" port 10000'},
 				},
-				ruhrgebiet7 = {
-					key = '67faca6081a623bed6db7f17fb319771d3f0f02c3c292d797da70802a51c82e5',
-					remotes = {'ipv4 "ffrg7.freifunk-ruhrgebiet.de" port 10000'},
-				},
-				ruhrgebiet8 = {
-					key = '67ff93fbaa2aef6324064c857afefc412b770d28ebee97ee53e55acfb8056f97',
-					remotes = {'ipv4 "ffrg8.freifunk-ruhrgebiet.de" port 10000'},
-				},
-				ruhrgebiet9 = {
-					key = 'c01f26d05f04ae5252a4277458c3d3321f8aa4eab28b0c0c20c6042a50c6d513',
-					remotes = {'ipv4 "ffrg9.freifunk-ruhrgebiet.de" port 10000'},
-				},
-				ruhrgebiet10 = {
-					key = 'f42624819d2c22917520edb618e9dd2acdf0bfed72849866a4ae6c52b6582e82',
-					remotes = {'ipv4 "ffrg10.freifunk-ruhrgebiet.de" port 10000'},
-				},
-				ruhrgebiet11 = {
-					key = 'd4f8fae3c709595302802367921a8166cb62eee60d342ebfd634abba785f3bad',
-					remotes = {'ipv4 "ffrg11.freifunk-ruhrgebiet.de" port 10000'},
+				do02201 = {
+					key = 'fd02c1810f8f9518fe44cbd7b4ccf47574bd8e5086dd4c2c4d22affa53e42d0f',
+					remotes = {'"node02-2.do.freifunk.ruhr" port 10001'},
 				},
 			},
 		},
@@ -97,7 +81,7 @@
 		branches = {
 			stable = {
 				name = 'stable',
-				mirrors = {'http://1.updates.services.ffrg/stable/sysupgrade'},
+				mirrors = {'http://update.services.ffdo.de/stable/sysupgrade'},
 				probability = 0.08,
 				good_signatures = 1,
 				pubkeys = {
@@ -107,7 +91,7 @@
 			},
 			beta = {
 				name = 'beta',
-				mirrors = {'http://1.updates.services.ffrg/beta/sysupgrade'},
+				mirrors = {'http://update.services.ffdo.de/beta/sysupgrade'},
 				probability = 0.08,
 				good_signatures = 1,
 				pubkeys = {
@@ -117,7 +101,7 @@
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://1.updates.services.ffrg/experimental/sysupgrade'},
+				mirrors = {'http://update.services.ffdo.de/experimental/sysupgrade'},
 				probability = 0.08,
 				good_signatures = 1,
 				pubkeys = {
@@ -139,11 +123,11 @@
 
 	config_mode = {
                 msg_welcome = [[
-Willkommen beim <a href="https://freifunk-dortmund.de/">Freifunk Dortmund</a>.
+Willkommen beim <a href="http://www.freifunk-dortmund.de/">Freifunk Dortmund</a>.
 Der Einrichtungsassistent hilft dir dabei, deinen neuen Freifunk-Knoten zu konfigurieren. 
 F&uuml;lle das folgende Formular deinen Vorstellungen entsprechend aus und sende es ab.
 Weitere Informationen und Hilfe zur Konfiguration findest du unter
-<a href="https://freifunk-dortmund.de/konfiguration/">https://freifunk-dortmund.de/konfiguration/</a>.
+<a href="http://freifunk-ruhrgebiet.de/anleitung/">http://freifunk-ruhrgebiet.de/anleitung/</a>.
 ]],
                 msg_pubkey = [[
 Das ist der VPN-Schl&uuml;ssel deines Freifunkknotens zur Information. Der Knoten ist nun direkt nutzbar.
@@ -162,7 +146,7 @@ Viel Spa&szlig; mit Deinem Knoten und der Erkundung von Freifunk!
 <p>
 Dein Knoten startet gerade neu und wird anschlie&szlig;end versuchen
 sich mit anderen Freifunkknoten in seiner N&auml;he zu verbinden.
-Weitere Informationen zur <a href="https://freifunk-dortmund.de/">Sub-Dom&auml;ne Dortmund</a> oder zur
+Weitere Informationen zur <a href="http://www.freifunk-dortmund.de/">Freifunk Community Dortmund</a> oder zur
 <a href="http://freifunk-ruhrgebiet.de/">Freifunk Dom&auml;ne Ruhrgebiet</a> findest du im Internet.
 </p>
 <p>

site.mk

@@ -1,5 +1,5 @@
 GLUON_SITE_PACKAGES := \
-        gluon-mesh-batman-adv-14 \
+        gluon-mesh-batman-adv-15 \
         gluon-alfred \
         gluon-announced \
         gluon-autoupdater \
@@ -23,7 +23,7 @@ GLUON_SITE_PACKAGES := \
         haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.6
+DEFAULT_GLUON_RELEASE := 0.6.1
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)