Browse Source

one update-path per region
modules: updated
site.mk: replace gluon-sutoupdater by ffho-autoupdater
site.conf: update autoupdater-path

Karsten Böddeker 8 years ago
parent
commit
cf2a0aa227
3 changed files with 7 additions and 7 deletions
  1. 1 1
      modules
  2. 4 4
      site.conf
  3. 2 2
      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=master
-PACKAGES_FFHO_COMMIT=0e0b97ec313358aad0b6f8066eaa168a3b68d68c
+PACKAGES_FFHO_COMMIT=72fcb3a0fb2700e5194066542c74b04b52765c7a

+ 4 - 4
site.conf

@@ -186,7 +186,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]/stable', 'http://firmware.paderborn.freifunk.net/stable'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/stable', 'http://firmware.ffho.net/%GS/stable'},
 
 				-- Number of valid manifest signatures necessary to accept the manifest as "good".
 				good_signatures = 3,
@@ -203,7 +203,7 @@
 			},
 			testing = {
 				name = 'testing',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/testing','http://firmware.paderborn.freifunk.net/testing'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/testing','http://firmware.ffho.net/%GS/testing'},
 				good_signatures = 2,
 				pubkeys = {
 					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
@@ -216,7 +216,7 @@
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/experimental','http://firmware.paderborn.freifunk.net/experimental'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/experimental','http://firmware.ffho.net/%GS/experimental'},
 				good_signatures = 1,
 				pubkeys = {
 					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
@@ -240,4 +240,4 @@
 	-- enable BATMAN on WAN interface by default (requires gluon-batman-on-wan package)
 	batman_on_wan = 0,
 
-}
+}

+ 2 - 2
site.mk

@@ -9,7 +9,7 @@ GLUON_SITE_PACKAGES := \
 	ffho-site-auto-select \
 	gluon-alfred \
 	gluon-respondd \
-	gluon-autoupdater \
+	ffho-autoupdater \
 	ffho-autoupdater-wifi-fallback \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
@@ -40,4 +40,4 @@ DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 GLUON_PRIORITY ?= $(DEFAULT_GLUON_PRIORITY)
-GLUON_LANGS ?= en de
+GLUON_LANGS ?= en de