From 9a3d1b9a6514ac7527cc2c6dc4cb189cd5081be2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 Feb 2015 19:20:14 +0100 Subject: [PATCH 1/9] Tested that autoupdater is enabled by default (fixes #6) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0aabee0..84afdf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 2015.1 (NOT RELEASED YET) - Updated to Gluon 2014.4 release + - Autoupdater was previously disabled per default, now it is enabled ## snapshot~20141119 - fixed ipv4-prefix to /16 netmask From 30ab2df7232557161cb212a0ca1741d96d45f17d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 Feb 2015 21:20:58 +0100 Subject: [PATCH 2/9] Add freifunk hostname prefix again Default Node name -c6721f62c148 looks stupid. --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index c48e55c..78c01e1 100644 --- a/site.conf +++ b/site.conf @@ -17,7 +17,7 @@ site_code: Shortcode of your community ]] - hostname_prefix = '', + hostname_prefix = 'freifunk', site_name = 'Freifunk München', site_code = 'ffmuc', opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages', From c1f8b1f9f016ec29f3e213749804380d35983854 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 Feb 2015 21:22:07 +0100 Subject: [PATCH 3/9] Fetch experimental firmware from build.freifunk-muenchen.de --- site.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/site.conf b/site.conf index 78c01e1..505b92f 100644 --- a/site.conf +++ b/site.conf @@ -168,15 +168,14 @@ autoupdater = { 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) }, }, }, From 1169c23efb5721b39bbfc1795640b2ce6c7fe5fc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 Feb 2015 21:22:35 +0100 Subject: [PATCH 4/9] Stable firmware can be fetched from build server, require 2 signatures Requires 2 signatures. --- site.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 505b92f..8b49b66 100644 --- a/site.conf +++ b/site.conf @@ -157,12 +157,14 @@ autoupdater = { '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 = { From fe45f0b36259463e762c3641a9d5d89e1d7f8bcc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 Feb 2015 21:31:44 +0100 Subject: [PATCH 5/9] CHANGELOG.md: Add autoupdater changes --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84afdf4..58a39e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,10 @@ ## 2015.1 (NOT RELEASED YET) - Updated to Gluon 2014.4 release - - Autoupdater was previously disabled per default, now it is enabled + - 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 From f04800038a3a891ad968045ed0bcbc1766fdf727 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 14 Feb 2015 00:57:23 +0100 Subject: [PATCH 6/9] Makefile: Fix manifest builds --- Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 451c302..4e23a29 100644 --- a/Makefile +++ b/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 From e936a6287163b1e19ffff8075b56a49c1b0fb36a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 16 Feb 2015 04:31:01 +0100 Subject: [PATCH 7/9] Add salsa2012+umac fastd method --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 8b49b66..33b596b 100644 --- a/site.conf +++ b/site.conf @@ -117,7 +117,7 @@ fastd_mesh_vpn = { - methods = {'salsa2012+gmac'}, + methods = {'salsa2012+umac', 'salsa2012+gmac'}, mtu = 1426, backbone = { limit = 2, From 7aa3522e0493deae9eb183dc5c4ffcae0054eb6f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 16 Feb 2015 04:33:07 +0100 Subject: [PATCH 8/9] Remove NTP servers that are not working --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 33b596b..9c39682 100644 --- a/site.conf +++ b/site.conf @@ -40,7 +40,7 @@ http://www.pool.ntp.org/zone/de ]] timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', - ntp_servers = {'1.ntp.services.ffm','2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm'}, + ntp_servers = {'1.ntp.services.ffm','3.ntp.services.ffm'}, --[[ Wireless settings regdom: IEEE 802.11 Regulatory Domain From 9683e47c411a006beae7b9c17031a4c2ccba5fa6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 16 Feb 2015 04:35:06 +0100 Subject: [PATCH 9/9] Remove gw02, has been down for a while now --- site.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/site.conf b/site.conf index 9c39682..2b2012c 100644 --- a/site.conf +++ b/site.conf @@ -126,11 +126,7 @@ key = '0ac59c349980993c99e74e1c5242c39cdd7282fbab0b9575b35762993df510f3', remotes = {'ipv4 "37.120.168.150" port 10000'}, }, - vpn_gw02 = { --[[ VPN Server von frnk (Island greencloud) ]] - key = 'fd0b9a4a2f5117b2cc187e80e3656b1da854dd1bcbc17680833cc6824b3c4101', - remotes = {'ipv4 "46.149.23.224" port 10000'}, - }, - vpn_gw04 = { --[[ VPN Server von mephisto ]] + vpn_gw04 = { --[[ VPN Server von mephisto ]] key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5', remotes = {'ipv4 "213.166.225.3" port 10000'}, },