Browse Source

update modules and site.[mk|conf]

signing keys:
- remove HeJ
- add phimeas
Karsten Böddeker 7 years ago
parent
commit
9c02cd1e36
3 changed files with 11 additions and 11 deletions
  1. 1 1
      modules
  2. 8 9
      site.conf
  3. 2 1
      site.mk

+ 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.1.x
-PACKAGES_FFHO_COMMIT=f3eda0558c0af7ca837f947d0416143df6940d28
+PACKAGES_FFHO_COMMIT=234ce04ad00c47eb143a3c276dd648397c18f48c

+ 8 - 9
site.conf

@@ -29,7 +29,7 @@
 	opkg = {
 		openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
 		extra = {
-			modules = 'http://firmware.ffho.net/modules/gluon-ffho-%GR/%S',
+			modules = 'http://firmware.ffho.net/%GR/modules/%S',
 		},
 	},
 
@@ -85,7 +85,7 @@
 	-- fastd (vpn) settings
 	fastd_mesh_vpn = {
 		-- cipher(s) to use
-		methods = {'salsa2012+gmac'},
+		methods = {'salsa2012+umac'},
 
 		-- the maximum transfer unit
 		-- use 1426 for IPv4 gateways
@@ -182,42 +182,42 @@
 				-- 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', 'http://firmware.ffho.net/%GS/stable'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/stable/sysupgrade', 'http://firmware.ffho.net/%GS/stable/sysupgrade'},
 
 				-- Number of valid manifest signatures necessary to accept the manifest as "good".
 				good_signatures = 3,
 
 				-- list of public keys which are considered "good" for manifest signatures
 				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
 					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
+					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
 				},
 			},
 			testing = {
 				name = 'testing',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/testing','http://firmware.ffho.net/%GS/testing'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/testing/sysupgrade','http://firmware.ffho.net/%GS/testing/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
 					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
+					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
 				},
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/experimental','http://firmware.ffho.net/%GS/experimental'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/experimental/sysupgrade','http://firmware.ffho.net/%GS/experimental/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
 					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
+					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
 				},
 			},
 		},
@@ -227,7 +227,6 @@
 	debugserver = {
 		host = { 'debugreport.ffho.net', '2a01:a700:4621:d102::10' },
 		port = 1337,
-		liveport = 1338,
 	},
 
 	-- enable BATMAN on WAN interface by default (requires gluon-batman-on-wan package)

+ 2 - 1
site.mk

@@ -1,7 +1,7 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-14 \
 	gluon-alfred \
-	ffho-aptimer \
+	ffho-ap-timer \
 	gluon-respondd \
 	ffho-ath9k-blackout-workaround \
 	ffho-autoupdater \
@@ -69,4 +69,5 @@ DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 GLUON_PRIORITY ?= $(DEFAULT_GLUON_PRIORITY)
+GLUON_REGION ?= eu
 GLUON_LANGS ?= en de