Browse Source

Merge branch 'experimental' into testing

Karsten Böddeker 7 years ago
parent
commit
e40c303a57
3 changed files with 14 additions and 18 deletions
  1. 12 16
      extra/template.conf
  2. 1 1
      modules
  3. 1 1
      site.mk

+ 12 - 16
extra/template.conf

@@ -14,20 +14,20 @@
 
 	-- v4 and v6 prefixes in which nodes+clients might get an IP
 	prefix4 = '10.132.0.0/19',
-	prefix6 = 'fdca:ffee:ff12:132::/64',
+	prefix6 = '2a03:2260:2342:0::/64',
 
 	-- extra ipv6 prefixes used in this mesh area
-	additional_prefix6 = { '2001:470:6d:860::/64', '2a03:2260:2342::/64', },
+	additional_prefix6 = {'fdca:ffee:ff12:132::/64'},
 
 	-- timezone
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 
 	-- network-internal ntp service
-	ntp_servers = {'ntp.in.ffho.net'},
+	ntp_servers = {'ntp.srv.in.ffho.net'},
 
 	-- OpenWRT Package Repository (IPv6 capable)
 	opkg = {
-		openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+		openwrt = 'http://firmware.srv.in.ffho.net/openwrt/%n/%v/%S/packages',
 		extra = {
 			modules = 'http://firmware.srv.in.ffho.net/%GR/modules/%S',
 		},
@@ -72,7 +72,7 @@
 	-- must lie in the above prefix4 and prefix6.
 	next_node = {
 		ip4 = '10.132.0.1',
-		ip6 = 'fdca:ffee:ff12:132::1',
+		ip6 = '2a03:2260:2342:0::1',
 
 		-- mac address, must be unique in the client network
 		-- (usually, you don't need to change this)
@@ -118,13 +118,17 @@
 					},
 					gw03 = {
 						key = '629b2742922f068ef49558283aea4b75c1427d8cdd3fcd2dbd7c00880547d3b3',
-						remotes = { '"gw03.ffho.net" port 10000'},
+						remotes = {
+							'"gw03-v14.ffho.net" port 10000',
+							'ipv6 "2a00:13c8:1000:2::163" port 10000',
+							'ipv4 "185.46.137.163" port 10000',
+						},
 					},
 					gw04 = {
 						key = 'cf3855e5fa04e4c04a294cb6e8902f91c7ff7ef82bf031cc842a2b79b936677c',
 						remotes = {
-							'"gw04.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a02:450:1:4::10" port 10000',
+							'"gw04-v14.ffho.net" port 10000',
+							'ipv6 "2a02:450:1::34" port 10000',
 							'ipv4 "80.70.181.57" port 10000',
 						},
 					},
@@ -136,14 +140,6 @@
 							'ipv4 "192.26.175.182" port 10000',
 						},
 					},
-					gw08 = {
-						key = '3da050bbf1c3e95af286af65553f546fd563d9cb5d4b3b3444069bef281de621',
-						remotes = {
-							'"gw08.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a03:4000:6:1151::ff12" port 10000',
-							'ipv4 "5.45.107.59" port 10000',
-						},
-					},
 				},
 			},
 		},

+ 1 - 1
modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffho-packages.git
 PACKAGES_FFHO_BRANCH=v2016.2.x
-PACKAGES_FFHO_COMMIT=4d8cb845f98690186c907b1099a86e742ed4dfc8
+PACKAGES_FFHO_COMMIT=b4924e41bb3622b57e7ab8514dacbaa1d1133c45

+ 1 - 1
site.mk

@@ -63,7 +63,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 0.7.4~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.7.5~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)