From d7aac9d8ec597d9182571726938a8aaaca9027d4 Mon Sep 17 00:00:00 2001 From: Julian Kornberger Date: Sat, 5 Sep 2015 12:34:53 +0200 Subject: [PATCH 01/11] Update public key of vpn06 --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 5aa2ef2..782e85a 100644 --- a/site.conf +++ b/site.conf @@ -67,7 +67,7 @@ remotes = {'ipv4 "vpn05.bremen.freifunk.net" port 10000', 'ipv4 "vpn05.ffhb.de" port 10000'}, }, vpn06 = { - key = '95d907f77128177d073cf7537a81f78bcd6d10fb04cfcda493915944c477fd87', + key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3', remotes = {'ipv4 "vpn06.bremen.freifunk.net" port 10000', 'ipv6 "vpn06.ffhb.de" port 10000'}, }, }, From aa8297ff1b1949069739358660b53dc0e5f5cdca Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Sat, 7 Nov 2015 20:55:30 +0100 Subject: [PATCH 02/11] Use readlink as alternative to realpath --- build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index dc3c0c4..dbade16 100755 --- a/build.sh +++ b/build.sh @@ -7,7 +7,12 @@ KEYFILE="$HOME/.ecdsakey" set -eu -export GLUON_SITEDIR="$(dirname "$(realpath "$0")")" +if which realpath > /dev/null; then + GLUON_SITEDIR="$(dirname "$(realpath "$0")")" +else + GLUON_SITEDIR="$(dirname "$(readlink -f "$0")")" +fi +export GLUON_SITEDIR get_GLUON_TAG() { if ! git --git-dir="${GLUON_DIR}/.git" describe --exact-match; then From 4005a890f62a95c16864a591c634b12a34275ccb Mon Sep 17 00:00:00 2001 From: mortzu Date: Sun, 8 Nov 2015 12:44:11 +0100 Subject: [PATCH 03/11] Updated my firmware URL --- site.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index 782e85a..dbcdc71 100644 --- a/site.conf +++ b/site.conf @@ -95,7 +95,7 @@ 'http://[2001:bf7:540::c8]/testing/sysupgrade', -- jplitza 'http://[2a03:b0c0:3:d0::19:4001]/ffhb-mirror/firmware/testing/sysupgrade', -- janeric 'http://[2001:bf7:540::6f]/ffhb-mirror/testing/sysupgrade', -- ec8or - 'http://[2001:bf7:540::82]/firmware/testing/sysupgrade', -- mortzu + 'http://[2001:bf7:540::84]/testing/sysupgrade', -- mortzu }, good_signatures = 1, pubkeys = { @@ -116,7 +116,7 @@ 'http://[2001:bf7:540::c8]/stable/sysupgrade', -- jplitza 'http://[2a03:b0c0:3:d0::19:4001]/ffhb-mirror/firmware/stable/sysupgrade', -- janeric 'http://[2001:bf7:540::6f]/ffhb-mirror/stable/sysupgrade', -- ec8or - 'http://[2001:bf7:540::82]/firmware/stable/sysupgrade', -- mortzu + 'http://[2001:bf7:540::84]/stable/sysupgrade', -- mortzu }, good_signatures = 2, pubkeys = { From 1c15012b3d23dd4cbdefa1d845bef6166768a444 Mon Sep 17 00:00:00 2001 From: morpheus Date: Sun, 15 Nov 2015 17:57:18 +0100 Subject: [PATCH 04/11] new ipv6 prefix --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index dbcdc71..362dc25 100644 --- a/site.conf +++ b/site.conf @@ -3,7 +3,7 @@ site_code = 'ffhb', prefix4 = '10.196.0.0/17', - prefix6 = '2001:bf7:540::/64', + prefix6 = '2a02:8782:ffbb:1337::/64', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin ntp_servers = { From 156c24a9e785867f427a5746602b26fecdeadf58 Mon Sep 17 00:00:00 2001 From: morpheus Date: Sun, 15 Nov 2015 19:59:57 +0100 Subject: [PATCH 05/11] typo in v6 prefix --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 362dc25..0a848e1 100644 --- a/site.conf +++ b/site.conf @@ -3,7 +3,7 @@ site_code = 'ffhb', prefix4 = '10.196.0.0/17', - prefix6 = '2a02:8782:ffbb:1337::/64', + prefix6 = '2a06:8782:ffbb:1337::/64', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin ntp_servers = { From 8b5682d6c627515218eddcd468411b68a53f1258 Mon Sep 17 00:00:00 2001 From: mortzu Date: Mon, 16 Nov 2015 13:05:03 +0100 Subject: [PATCH 06/11] Updated my mirror --- site.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index 0a848e1..0eacff1 100644 --- a/site.conf +++ b/site.conf @@ -95,7 +95,7 @@ 'http://[2001:bf7:540::c8]/testing/sysupgrade', -- jplitza 'http://[2a03:b0c0:3:d0::19:4001]/ffhb-mirror/firmware/testing/sysupgrade', -- janeric 'http://[2001:bf7:540::6f]/ffhb-mirror/testing/sysupgrade', -- ec8or - 'http://[2001:bf7:540::84]/testing/sysupgrade', -- mortzu + 'http://[2a06:8782:ffbb:1337::84]/testing/sysupgrade', -- mortzu }, good_signatures = 1, pubkeys = { @@ -116,7 +116,7 @@ 'http://[2001:bf7:540::c8]/stable/sysupgrade', -- jplitza 'http://[2a03:b0c0:3:d0::19:4001]/ffhb-mirror/firmware/stable/sysupgrade', -- janeric 'http://[2001:bf7:540::6f]/ffhb-mirror/stable/sysupgrade', -- ec8or - 'http://[2001:bf7:540::84]/stable/sysupgrade', -- mortzu + 'http://[2a06:8782:ffbb:1337::84]/stable/sysupgrade', -- mortzu }, good_signatures = 2, pubkeys = { From 74ca629e13cad20f25b27d28604d273f80fc79a1 Mon Sep 17 00:00:00 2001 From: mortzu Date: Mon, 16 Nov 2015 13:09:22 +0100 Subject: [PATCH 07/11] Fixed IPv6 address --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 0eacff1..17ed7cf 100644 --- a/site.conf +++ b/site.conf @@ -35,7 +35,7 @@ next_node = { ip4 = '10.196.0.127', - ip6 = '2001:bf7:540::127', + ip6 = '2a06:8782:ffbb:1337::127', mac = '16:41:95:40:f7:dc', }, From fea7b36562eea21333eb4fbc83f75befb5dc32d1 Mon Sep 17 00:00:00 2001 From: mortzu Date: Fri, 20 Nov 2015 10:43:19 +0100 Subject: [PATCH 08/11] Removed my mirror --- site.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/site.conf b/site.conf index 17ed7cf..9661b53 100644 --- a/site.conf +++ b/site.conf @@ -95,7 +95,6 @@ 'http://[2001:bf7:540::c8]/testing/sysupgrade', -- jplitza 'http://[2a03:b0c0:3:d0::19:4001]/ffhb-mirror/firmware/testing/sysupgrade', -- janeric 'http://[2001:bf7:540::6f]/ffhb-mirror/testing/sysupgrade', -- ec8or - 'http://[2a06:8782:ffbb:1337::84]/testing/sysupgrade', -- mortzu }, good_signatures = 1, pubkeys = { @@ -116,7 +115,6 @@ 'http://[2001:bf7:540::c8]/stable/sysupgrade', -- jplitza 'http://[2a03:b0c0:3:d0::19:4001]/ffhb-mirror/firmware/stable/sysupgrade', -- janeric 'http://[2001:bf7:540::6f]/ffhb-mirror/stable/sysupgrade', -- ec8or - 'http://[2a06:8782:ffbb:1337::84]/stable/sysupgrade', -- mortzu }, good_signatures = 2, pubkeys = { From 15c4b904a8d8d66b7cd83ae9978651a35e4185db Mon Sep 17 00:00:00 2001 From: mortzu Date: Fri, 20 Nov 2015 11:23:23 +0100 Subject: [PATCH 09/11] Removed my key --- site.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/site.conf b/site.conf index 9661b53..a319c5c 100644 --- a/site.conf +++ b/site.conf @@ -99,7 +99,6 @@ good_signatures = 1, pubkeys = { 'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', -- jplitza - '159ff7cdf2646f027bf8f901f8bd950cc3feca9ac13e29b70c57e162f7dafb1f', -- mortzu '5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny '99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt 'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver @@ -119,7 +118,6 @@ good_signatures = 2, pubkeys = { 'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', -- jplitza - '159ff7cdf2646f027bf8f901f8bd950cc3feca9ac13e29b70c57e162f7dafb1f', -- mortzu '5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny '99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt 'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver From c2832227dc046fe6196162600d68223f7b5d4736 Mon Sep 17 00:00:00 2001 From: komaflash // ec8or Date: Wed, 25 Nov 2015 22:51:23 +0100 Subject: [PATCH 10/11] Updated ec8ors mirror IPs --- site.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index a319c5c..e40eb19 100644 --- a/site.conf +++ b/site.conf @@ -94,7 +94,7 @@ 'http://downloads.bremen.freifunk.net/firmware/testing/sysupgrade', 'http://[2001:bf7:540::c8]/testing/sysupgrade', -- jplitza 'http://[2a03:b0c0:3:d0::19:4001]/ffhb-mirror/firmware/testing/sysupgrade', -- janeric - 'http://[2001:bf7:540::6f]/ffhb-mirror/testing/sysupgrade', -- ec8or + 'http://[2a06:8782:ffbb:1337::6f]/ffhb-mirror/testing/sysupgrade', -- ec8or }, good_signatures = 1, pubkeys = { @@ -113,7 +113,7 @@ 'http://downloads.bremen.freifunk.net/firmware/stable/sysupgrade', 'http://[2001:bf7:540::c8]/stable/sysupgrade', -- jplitza 'http://[2a03:b0c0:3:d0::19:4001]/ffhb-mirror/firmware/stable/sysupgrade', -- janeric - 'http://[2001:bf7:540::6f]/ffhb-mirror/stable/sysupgrade', -- ec8or + 'http://[2a06:8782:ffbb:1337::6f]/ffhb-mirror/stable/sysupgrade', -- ec8or }, good_signatures = 2, pubkeys = { From 8274309d11b8372fd32aa00c535c10d05449f2cd Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Tue, 8 Dec 2015 16:47:09 +0100 Subject: [PATCH 11/11] site.conf: Fix typo --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index e40eb19..77d7ddc 100644 --- a/site.conf +++ b/site.conf @@ -68,7 +68,7 @@ }, vpn06 = { key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3', - remotes = {'ipv4 "vpn06.bremen.freifunk.net" port 10000', 'ipv6 "vpn06.ffhb.de" port 10000'}, + remotes = {'ipv4 "vpn06.bremen.freifunk.net" port 10000', 'ipv4 "vpn06.ffhb.de" port 10000'}, }, }, },