Update site.conf for new supernodes, switch mesh to 802.11s

site.conf

@@ -4,7 +4,7 @@
 	site_code = 'ffdo',
 
 	prefix4 = '10.233.0.0/16',
-	prefix6 = '2a03:2260:50:5::/64',
+	prefix6 = '2a03:2260:300a:1000::/64',
 
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 	ntp_servers = {'ntp.services.ffdo.de'},
@@ -22,9 +22,8 @@
 		ap = {
 			ssid = 'Freifunk',
 		},
-		ibss = {
-			ssid = 'wifimesh-dortmund',
-			bssid = '02:ff:d0:09:ff:01',
+		mesh = {
+			id = 'ffdo-mesh-batadv'
 			mcast_rate = 12000,
 		},
 	},
@@ -34,17 +33,16 @@
 		ap = {
 			ssid = 'Freifunk (5GHz)',
 		},
-		ibss = {
-			ssid = 'wifimesh-dortmund5',
-			bssid = '02:ff:d0:09:ff:02',
+		mesh = {
+			id = 'ffdo-mesh-batadv'
 			mcast_rate = 12000,
 		},
 	},
 
 	next_node = {
 		ip4 = '10.233.254.254',
-		ip6 = '2a03:2260:50:5::cafe',
-		mac = '16:41:95:40:f7:dc',
+		ip6 = '2a03:2260:300a:1000::ffd0',
+		mac = '02:ff:d0:09:ff:02',
 	},
 
 	fastd_mesh_vpn = {
@@ -55,20 +53,20 @@
 				limit = 1,
 				peers = {
 					do01100 = {
-						key = '8a334499c905966d48b1cdb01d668b114b17cd6490ead54c6eb5e2d15c1852e4',
-						remotes = {'"snode01-1.ffdo.de" port 10000'},
+						key = '4e3871281764a80fddff41152a24f198d8646f62bd240db8659495bd7f6ef0da',
+						remotes = {'"sn-dtm01.ffdo.de" port 10000'},
 					},
 					do01200 = {
-						key = 'd2de261203853d14389d80ca004c98d6a67c244bfe4096b7a6f36a0a8484c55a',
-						remotes = {'"snode01-2.ffdo.de" port 10000'},
+						key = 'dbf766f9f268ed1b301f4bf77a9665faa696fd9a15b9447247ce12fab6fb6718',
+						remotes = {'"sn-dtm02.ffdo.de" port 10000'},
 					},
 					do02100 = {
-						key = '12b94258d16f864c863f7bab07a77514eddffe3ba01c9d4948bd84a192d28f42',
-						remotes = {'"snode02-1.ffdo.de" port 10000'},
+						key = 'f92dc908adcb99bf55c8de10ee7717e69eacac12bcef559aebc14ea2ec109337',
+						remotes = {'"sn-ber01.ffdo.de" port 10000'},
 					},
 					do02200 = {
-						key = '2a0e055aa71e68f2caf09307e8f8c89c22ec36419fb38e089005cc40687e5187',
-						remotes = {'"snode02-2.ffdo.de" port 10000'},
+						key = 'e6029a94aa2ac28014ea208b30398092c33836f05897e5aa5fa1d8525e35a136',
+						remotes = {'"sn-ber02.ffdo.de" port 10000'},
 					},
 				},
 			},