ffhb/gluon-site-ffhb
ffhb
/
gluon-site-ffhb
mirror of https://github.com/FreifunkBremen/gluon-site-ffhb.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into for-2015.2

This commit is contained in:
Julian Kornberger 2015-12-12 14:21:27 +01:00
parent c3bf540db5 99dae660b6
commit 7c828679b9
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.sh
View File

@ -7,7 +7,12 @@ KEYFILE="$HOME/.ecdsakey"
set -eu 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() { get_GLUON_TAG() {
if ! git --git-dir="${GLUON_DIR}/.git" describe --exact-match; then if ! git --git-dir="${GLUON_DIR}/.git" describe --exact-match; then

16
site.conf
View File

@ -3,7 +3,7 @@
site_code = 'ffhb', site_code = 'ffhb',
prefix4 = '10.196.0.0/17', prefix4 = '10.196.0.0/17',
prefix6 = '2001:bf7:540::/64', prefix6 = '2a06:8782:ffbb:1337::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = { ntp_servers = {
@ -51,7 +51,7 @@
next_node = { next_node = {
ip4 = '10.196.0.127', ip4 = '10.196.0.127',
ip6 = '2001:bf7:540::127', ip6 = '2a06:8782:ffbb:1337::127',
mac = '16:41:95:40:f7:dc', mac = '16:41:95:40:f7:dc',
}, },
@ -83,8 +83,8 @@
remotes = {'ipv4 "vpn05.bremen.freifunk.net" port 10000', 'ipv4 "vpn05.ffhb.de" port 10000'}, remotes = {'ipv4 "vpn05.bremen.freifunk.net" port 10000', 'ipv4 "vpn05.ffhb.de" port 10000'},
}, },
vpn06 = { vpn06 = {
key = '95d907f77128177d073cf7537a81f78bcd6d10fb04cfcda493915944c477fd87', 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'},
}, },
}, },
}, },
@ -110,13 +110,11 @@
'http://downloads.bremen.freifunk.net/firmware/testing/sysupgrade', 'http://downloads.bremen.freifunk.net/firmware/testing/sysupgrade',
'http://[2001:bf7:540::c8]/testing/sysupgrade', -- jplitza 'http://[2001:bf7:540::c8]/testing/sysupgrade', -- jplitza
'http://[2a03:b0c0:3:d0::19:4001]/ffhb-mirror/firmware/testing/sysupgrade', -- janeric '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
'http://[2001:bf7:540::82]/firmware/testing/sysupgrade', -- mortzu
}, },
good_signatures = 1, good_signatures = 1,
pubkeys = { pubkeys = {
'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', -- jplitza 'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', -- jplitza
'159ff7cdf2646f027bf8f901f8bd950cc3feca9ac13e29b70c57e162f7dafb1f', -- mortzu
'5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny '5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny
'99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt '99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt
'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver 'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver
@ -131,13 +129,11 @@
'http://downloads.bremen.freifunk.net/firmware/stable/sysupgrade', 'http://downloads.bremen.freifunk.net/firmware/stable/sysupgrade',
'http://[2001:bf7:540::c8]/stable/sysupgrade', -- jplitza 'http://[2001:bf7:540::c8]/stable/sysupgrade', -- jplitza
'http://[2a03:b0c0:3:d0::19:4001]/ffhb-mirror/firmware/stable/sysupgrade', -- janeric '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
'http://[2001:bf7:540::82]/firmware/stable/sysupgrade', -- mortzu
}, },
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', -- jplitza 'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', -- jplitza
'159ff7cdf2646f027bf8f901f8bd950cc3feca9ac13e29b70c57e162f7dafb1f', -- mortzu
'5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny '5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny
'99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt '99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt
'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver 'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver