Merge branch 'master' into experimental

Conflicts:
	site.conf

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 ## 2015.1 (NOT RELEASED YET)
  - Updated to Gluon 2014.4 release
+ - Autoupdater
+   - Now enabled per default
+   - Also fetch firmware from build.freifunk-muenchen.de
+   - Require two signatures instead of one for stable autoupdate
 
 ## snapshot~20141119
  - fixed ipv4-prefix to /16 netmask

Makefile

@@ -26,20 +26,17 @@ all: gluon-clean
 build: gluon-prepare
 	${GLUON_MAKE}
 
-images: build
-	${MAKE} images-clean
+manifest: build
+	${GLUON_MAKE} manifest
 	mv ${GLUON_BUILD_DIR}/images .
 
-manifest: images
-	${GLUON_MAKE} manifest
-
-sign: gluon-prepare manifest
+sign: manifest
 	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest
 
 ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
 
-gluon-prepare: ${GLUON_BUILD_DIR}
+gluon-prepare: images-clean ${GLUON_BUILD_DIR}
 	(cd ${GLUON_BUILD_DIR} && git fetch origin && git checkout -q ${GLUON_GIT_REF})
 	ln -sfT .. ${GLUON_BUILD_DIR}/site
 	${GLUON_MAKE} update

site.conf

@@ -86,26 +86,25 @@
           'http://[fdef:ffc0:4fff::11]/firmware/stable/sysupgrade/',
           'http://[fdef:ffc0:4fff::12]/firmware/stable/sysupgrade/',
           'http://[fdef:ffc0:4fff::13]/firmware/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/firmware/stable/sysupgrade/',
         },
         probability = 0.08,
-        good_signatures = 1,
+        good_signatures = 2,
         pubkeys = {
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
         },
       },
       experimental = {
         name = 'experimental',
         mirrors = {
-          'http://[fdef:ffc0:4fff::11]/firmware/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::12]/firmware/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::13]/firmware/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/firmware/experimental/sysupgrade/',
         },
         probability = 0.1,
         good_signatures = 1,
         pubkeys = {
-          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
-          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
         },
       },
     },