Merge pull request #2 from Freifunk-Troisdorf/2014.4-ipv6

Update site.conf
This commit is contained in:
stebifan 2015-01-25 13:15:27 +01:00
commit af799e1bd6

View File

@ -37,23 +37,23 @@
'salsa2012+umac', 'salsa2012+umac',
'salsa2012+gmac' 'salsa2012+gmac'
}, },
mtu = 1426, mtu = 1406,
backbone = { backbone = {
limit = 2, limit = 2,
peers = { peers = {
wupper0 = { wupper1v6 = {
key = '7142f897f4e55d2c19207aa59db92ec54d7517cf558d5ecaef33689234952a4b', key = 'c3fe61335a6c92d2557cdaf93db2b80e7e5b9704290ccdb0ad34ee01c56b9116',
remotes = {'ipv4 "wupper0.freifunk-troisdorf.de" port 53840'}, remotes = {'"wupper1v6.freifunk-troisdorf.de" port 53840'},
}, },
gateway1 = { gateway1 = {
key = 'f355e18e0e442723548d21db8d762deeb1cfef18abd3c27180e7ca1ff6639422', key = 'f355e18e0e442723548d21db8d762deeb1cfef18abd3c27180e7ca1ff6639422',
remotes = {'ipv4 "gateway1.freifunk-troisdorf.de" port 53840'}, remotes = {'"gateway1.freifunk-troisdorf.de" port 53840'},
{'ipv6 "gateway1.freifunk-troisdorf.de" port 53840'},
}, },
}, },
}, },
}, },
autoupdater = { autoupdater = {
enabled = true, enabled = true,
branch = 'stable', branch = 'stable',
branches = { branches = {
@ -68,6 +68,7 @@
pubkeys = { pubkeys = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
}, },
}, },
@ -82,6 +83,7 @@
pubkeys = { pubkeys = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
}, },
}, },
experimental = { experimental = {
@ -95,6 +97,7 @@
pubkeys = { pubkeys = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
}, },
}, },
}, },