Browse Source

Update site.conf to new format

Michael Schwarz 9 years ago
parent
commit
b8c8b65b1c
1 changed files with 68 additions and 66 deletions
  1. 68 66
      site.conf

+ 68 - 66
site.conf

@@ -68,78 +68,80 @@
 		-- use 1426 for IPv4 gateways
 		mtu = 1406,
 
-		backbone = {
-			-- specifies how many servers are contacted
-			-- by a client simultanously
-			limit = 2,
-
-			-- list all available vpn servers
-			peers = {
-				gw01 = {
-					-- public fastd key of the vpn server
-					key = '97bc56ae561f67cfe15364134868c3553b5f1eab06f7bd9c5b93fbf280a52b51',
-					-- remotes is an array of ways on how to reach the VPN server
-					-- 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 = {
-						'ipv6 "v6.gw01.paderborn.freifunk.net" port 10000',
-						'ipv4 "v4.gw01.paderborn.freifunk.net" port 10000',
-						'ipv6 "2a01:4f8:190:2105::ff12" port 10000',
-						'ipv4 "85.10.248.243" port 10000',
+		groups = {
+			backbone = {
+				-- specifies how many servers are contacted
+				-- by a client simultanously
+				limit = 2,
+	
+				-- list all available vpn servers
+				peers = {
+					gw01 = {
+						-- public fastd key of the vpn server
+						key = '97bc56ae561f67cfe15364134868c3553b5f1eab06f7bd9c5b93fbf280a52b51',
+						-- remotes is an array of ways on how to reach the VPN server
+						-- 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 = {
+							'ipv6 "v6.gw01.paderborn.freifunk.net" port 10000',
+							'ipv4 "v4.gw01.paderborn.freifunk.net" port 10000',
+							'ipv6 "2a01:4f8:190:2105::ff12" port 10000',
+							'ipv4 "85.10.248.243" port 10000',
+						},
 					},
-				},
-				gw02 = {
-					key = 'e8fa9bf402fd33dd1ba804a97f2e46c704423ff49e9c55312845a7bfb93121ad',
-					remotes = {
-						'ipv6 "v6.gw02.paderborn.freifunk.net" port 10000',
-						'ipv4 "v4.gw02.paderborn.freifunk.net" port 10000',
-						'ipv6 "2a01:4f8:190:6500::18:1" port 10000',
-						'ipv4 "78.46.242.24" port 10000',
+					gw02 = {
+						key = 'e8fa9bf402fd33dd1ba804a97f2e46c704423ff49e9c55312845a7bfb93121ad',
+						remotes = {
+							'ipv6 "v6.gw02.paderborn.freifunk.net" port 10000',
+							'ipv4 "v4.gw02.paderborn.freifunk.net" port 10000',
+							'ipv6 "2a01:4f8:190:6500::18:1" port 10000',
+							'ipv4 "78.46.242.24" port 10000',
+						},
 					},
-				},
-				gw03 = {
-					key = 'cf7b54f7221a26251a5970e1d404f864ff4bfed3254bd741cf754445e040b9d0',
-					remotes = {
-						'ipv6 "v6.gw03.paderborn.freifunk.net" port 10000',
-						'ipv4 "v4.gw03.paderborn.freifunk.net" port 10000',
-						'ipv6 "2a01:a700:4621:d100::10" port 10000',
-						'ipv4 "31.172.8.123" port 10000',
+					gw03 = {
+						key = 'cf7b54f7221a26251a5970e1d404f864ff4bfed3254bd741cf754445e040b9d0',
+						remotes = {
+							'ipv6 "v6.gw03.paderborn.freifunk.net" port 10000',
+							'ipv4 "v4.gw03.paderborn.freifunk.net" port 10000',
+							'ipv6 "2a01:a700:4621:d100::10" port 10000',
+							'ipv4 "31.172.8.123" port 10000',
+						},
 					},
-				},
-				gw04 = {
-					key = 'cf3855e5fa04e4c04a294cb6e8902f91c7ff7ef82bf031cc842a2b79b936677c',
-					remotes = {
-						'ipv6 "v6.gw04.paderborn.freifunk.net" port 10000',
-						'ipv4 "v4.gw04.paderborn.freifunk.net" port 10000',
-						'ipv6 "2a02:450:1:4::10" port 10000',
-						'ipv4 "80.70.181.57" port 10000',
+					gw04 = {
+						key = 'cf3855e5fa04e4c04a294cb6e8902f91c7ff7ef82bf031cc842a2b79b936677c',
+						remotes = {
+							'ipv6 "v6.gw04.paderborn.freifunk.net" port 10000',
+							'ipv4 "v4.gw04.paderborn.freifunk.net" port 10000',
+							'ipv6 "2a02:450:1:4::10" port 10000',
+							'ipv4 "80.70.181.57" port 10000',
+						},
 					},
-				},
-				gw05 = {
-					key = 'd0d32a2f536a0fc1f0c848e6da15bd96851d5ff4fdf9239c830bab033ddcec1a',
-					remotes = {
-						'ipv6 "v6.gw05.paderborn.freifunk.net" port 10000',
-						'ipv4 "v4.gw05.paderborn.freifunk.net" port 10000',
-						'ipv6 "2001:638:502:e062::10" port 10000',
-						'ipv4 "192.26.175.162" port 10000',
+					gw05 = {
+						key = 'd0d32a2f536a0fc1f0c848e6da15bd96851d5ff4fdf9239c830bab033ddcec1a',
+						remotes = {
+							'ipv6 "v6.gw05.paderborn.freifunk.net" port 10000',
+							'ipv4 "v4.gw05.paderborn.freifunk.net" port 10000',
+							'ipv6 "2001:638:502:e062::10" port 10000',
+							'ipv4 "192.26.175.162" port 10000',
+						},
 					},
-				},
-				gw06 = {
-					key = 'b912bcf1c1335390364b8030448e53d8869b650f32923e59bf01d763d3028840',
-					remotes = {
-						'ipv6 "v6.gw06.paderborn.freifunk.net" port 10000',
-						'ipv4 "v4.gw06.paderborn.freifunk.net" port 10000',
-						'ipv6 "2a03:4000:6:20f0::ff12" port 10000',
-						'ipv4 "5.45.111.222" port 10000',
+					gw06 = {
+						key = 'b912bcf1c1335390364b8030448e53d8869b650f32923e59bf01d763d3028840',
+						remotes = {
+							'ipv6 "v6.gw06.paderborn.freifunk.net" port 10000',
+							'ipv4 "v4.gw06.paderborn.freifunk.net" port 10000',
+							'ipv6 "2a03:4000:6:20f0::ff12" port 10000',
+							'ipv4 "5.45.111.222" port 10000',
+						},
 					},
-				},
-				gw08 = {
-					key = '3da050bbf1c3e95af286af65553f546fd563d9cb5d4b3b3444069bef281de621',
-					remotes = {
-						'ipv6 "v6.gw08.paderborn.freifunk.net" port 10000',
-						'ipv4 "v4.gw08.paderborn.freifunk.net" port 10000',
-						'ipv6 "2a03:4000:6:1151::ff12" port 10000',
-						'ipv4 "5.45.107.59" port 10000',
+					gw08 = {
+						key = '3da050bbf1c3e95af286af65553f546fd563d9cb5d4b3b3444069bef281de621',
+						remotes = {
+							'ipv6 "v6.gw08.paderborn.freifunk.net" port 10000',
+							'ipv4 "v4.gw08.paderborn.freifunk.net" port 10000',
+							'ipv6 "2a03:4000:6:1151::ff12" port 10000',
+							'ipv4 "5.45.107.59" port 10000',
+						},
 					},
 				},
 			},