Browse Source

update site.conf

Karsten Böddeker 7 years ago
parent
commit
4d1c9cf372
1 changed files with 13 additions and 21 deletions
  1. 13 21
      site.conf

+ 13 - 21
site.conf

@@ -29,7 +29,7 @@
 	opkg = {
 		openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
 		extra = {
-			modules = 'http://firmware.ffho.net/%GR/modules/%S',
+			modules = 'http://firmware.srv.in.ffho.net/%GR/modules/%S',
 		},
 	},
 
@@ -106,8 +106,7 @@
 						-- 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',
+							'"gw01.paderborn.freifunk.net" port 10000',
 							'ipv6 "2a01:4f8:190:2105::ff12" port 10000',
 							'ipv4 "85.10.248.243" port 10000',
 						},
@@ -115,17 +114,19 @@
 					gw02 = {
 						key = 'e8fa9bf402fd33dd1ba804a97f2e46c704423ff49e9c55312845a7bfb93121ad',
 						remotes = {
-							'ipv6 "v6.gw02.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw02.paderborn.freifunk.net" port 10000',
+							'"gw02.paderborn.freifunk.net" port 10000',
 							'ipv6 "2a01:4f8:190:6500::18:1" port 10000',
 							'ipv4 "78.46.242.24" port 10000',
 						},
 					},
+					gw03 = {
+						key = '629b2742922f068ef49558283aea4b75c1427d8cdd3fcd2dbd7c00880547d3b3',
+						remotes = { '"gw03.ffho.net" port 10000'},
+					},
 					gw04 = {
 						key = 'cf3855e5fa04e4c04a294cb6e8902f91c7ff7ef82bf031cc842a2b79b936677c',
 						remotes = {
-							'ipv6 "v6.gw04.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw04.paderborn.freifunk.net" port 10000',
+							'"gw04.paderborn.freifunk.net" port 10000',
 							'ipv6 "2a02:450:1:4::10" port 10000',
 							'ipv4 "80.70.181.57" port 10000',
 						},
@@ -133,8 +134,7 @@
 					gw05 = {
 						key = 'd0d32a2f536a0fc1f0c848e6da15bd96851d5ff4fdf9239c830bab033ddcec1a',
 						remotes = {
-							'ipv6 "v6.gw05.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw05.paderborn.freifunk.net" port 10000',
+							'"gw05.paderborn.freifunk.net" port 10000',
 							'ipv6 "2001:638:502:1884::ff05" port 10000',
 							'ipv4 "192.26.175.182" port 10000',
 						},
@@ -142,18 +142,11 @@
 					gw08 = {
 						key = '3da050bbf1c3e95af286af65553f546fd563d9cb5d4b3b3444069bef281de621',
 						remotes = {
-							'ipv6 "v6.gw08.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw08.paderborn.freifunk.net" port 10000',
+							'"gw08.paderborn.freifunk.net" port 10000',
 							'ipv6 "2a03:4000:6:1151::ff12" port 10000',
 							'ipv4 "5.45.107.59" port 10000',
 						},
 					},
-					ffho_gw01 = {
-						key = '629b2742922f068ef49558283aea4b75c1427d8cdd3fcd2dbd7c00880547d3b3',
-						remotes = {
-							'"gw01.ffho.net" port 10000',
-						},
-					},
 				},
 			},
 		},
@@ -165,7 +158,6 @@
 			ingress = 3000,
 		},
 
-
 	},
 
 	-- configure the autoupdater
@@ -182,7 +174,7 @@
 				-- where to get the manifest file (without the trailing /manifest)
 				-- It's wise to use an internal address here,
 				-- but specifying a publicly available update site does not hurt.
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/stable/sysupgrade', 'http://firmware.ffho.net/%GS/stable/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/%GS/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%GS/stable/sysupgrade'},
 
 				-- Number of valid manifest signatures necessary to accept the manifest as "good".
 				good_signatures = 3,
@@ -199,7 +191,7 @@
 			},
 			testing = {
 				name = 'testing',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/testing/sysupgrade','http://firmware.ffho.net/%GS/testing/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/%GS/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%GS/stable/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
@@ -212,7 +204,7 @@
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/experimental/sysupgrade','http://firmware.ffho.net/%GS/experimental/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/%GS/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%GS/stable/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-