Browse Source

ffho_wag.conf: angepasst

Karsten Böddeker 9 years ago
parent
commit
56f27cb044
1 changed files with 11 additions and 11 deletions
  1. 11 11
      extra/ffho_wag.conf

+ 11 - 11
extra/ffho_wag.conf

@@ -11,16 +11,16 @@
 
 	-- v4 and v6 prefixes in which nodes+clients might get an IP
 	prefix4 = '10.132.64.0/19',
-	prefix6 = 'fdca:ffee:ff12:64::/64',
+	prefix6 = '2a03:2260:2006:23::/64',
 
 	-- extra ipv6 prefixes used in this mesh area
-	additional_prefix6 = { '2a03:2260:2006:23::/64', },
+	-- additional_prefix6 = { },
 
 	-- timezone
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 
 	-- network-internal ntp service
-	ntp_servers = {'ntp.ffho.net'},
+	ntp_servers = {'ntp.in.ffho.net'},
 
         -- OpenWRT Package Repository (IPv6 capable)
 	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/barrier_breaker/14.07/%S/packages/',
@@ -55,7 +55,7 @@
 	-- must lie in the above prefix4 and prefix6.
 	next_node = {
 		ip4 = '10.132.64.1',
-		ip6 = 'fdca:ffee:ff12:64::1',
+		ip6 = '2a03:2260:2006:23::1',
 
 		-- mac address, must be unique in the client network
 		-- (usually, you don't need to change this)
@@ -86,8 +86,8 @@
 						-- 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.wag.ffho.net" port 10000',
-							'ipv4 "v4.gw01.wag.ffho.net" port 10000',
+							'ipv6 "gw01.wag.ffho.net" port 10000',
+							'ipv4 "gw01.wag.ffho.net" port 10000',
 							-- 'ipv6 "ToDo" port 10000',
 							-- 'ipv4 "ToDo" port 10000',
 						},
@@ -95,8 +95,8 @@
 					gw02 = {
 						key = 'cf38aebe045c5c19c4018daf473071b298a607b095b4283e2cbf2669cc829e49',
 						remotes = {
-							'ipv6 "v6.gw02.wag.ffho.net" port 10000',
-							'ipv4 "v4.gw02.wag.ffho.net" port 10000',
+							'ipv6 "gw02.wag.ffho.net" port 10000',
+							'ipv4 "gw02.wag.ffho.net" port 10000',
 							-- 'ipv6 "ToDo" port 10000',
 							-- 'ipv4 "ToDo" port 10000',
 						},
@@ -123,7 +123,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]/ToDo/stable', 'http://firmware.ffho.net/ToDo/stable'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/wag/stable', 'http://firmware.wag.ffho.net/stable'},
 
 				-- Number of valid manifest signatures necessary to accept the manifest as "good".
 				good_signatures = 3,
@@ -139,7 +139,7 @@
 			},
 			testing = {
 				name = 'testing',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/ToDo/testing','http://firmware.ffho.net/ToDo/testing'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/wag/testing','http://firmware.wag.ffho.net/testing'},
 				good_signatures = 2,
 				pubkeys = {
 					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
@@ -151,7 +151,7 @@
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/ToDo/experimental','http://firmware.ffho.net/ToDo/experimental'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/wag/experimental','http://firmware.wag.ffho.net/experimental'},
 				good_signatures = 1,
 				pubkeys = {
 					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ