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 pull request #6 from jortgies/patch 

* added my public key
* added my firmware mirrors

Conflicts:
	site.conf
This commit is contained in:
Jan-Philipp Litza 2015-08-28 09:16:45 +02:00
parent 58339d373a 986b64af11
commit 526e3332ab
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
site.conf
View File

@ -88,6 +88,7 @@
mirrors = { mirrors = {
'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
}, },
good_signatures = 1, good_signatures = 1,
pubkeys = { pubkeys = {
@ -96,6 +97,7 @@
'5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny '5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny
'99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt '99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt
'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver 'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver
'b3d1fe3851f4c70b1eda7103fd835d56f3a5dc7f057b6730f83d895332a9caa2', -- janeric
}, },
}, },
stable = { stable = {
@ -103,6 +105,7 @@
mirrors = { mirrors = {
'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
}, },
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
@ -111,6 +114,7 @@
'5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny '5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny
'99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt '99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt
'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver 'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver
'b3d1fe3851f4c70b1eda7103fd835d56f3a5dc7f057b6730f83d895332a9caa2', -- janeric
}, },
}, },
}, },