Update site.conf

This commit is contained in:
xeaon 2015-06-01 20:22:03 +02:00
parent 856c2562be
commit efb733ab40

View File

@ -33,42 +33,50 @@
mac = '04:74:05:d0:4f:aa',
},
fastd_mesh_vpn = {
methods = {
'salsa2012+umac',
'salsa2012+gmac'
},
methods = {'salsa2012+umac', 'salsa2012+gmac'},
mtu = 1406,
groups = {
backbone = {
limit = 2,
peers = {
wupper0 = {
key = '7142f897f4e55d2c19207aa59db92ec54d7517cf558d5ecaef33689234952a4b',
remotes = {'"wupper0.freifunk-troisdorf.de" port 53840'},
},
wupper1 = {
key = '6eae041199ee627689bfa026afbd8a9ab299eca8aed4144321d098cffd62668e',
remotes = {'"wupper1.freifunk-troisdorf.de" port 53840'},
},
wupper2 = {
key = 'b7f319d59d8383ba813c3503416bca45f70852e4d207b1743bb6cdca1e30d9f5',
remotes = {'"wupper2.freifunk-troisdorf.de" port 53840'},
},
wupper3 = {
key = 'c8f3d1d10b0d6389e39c3c3cb08adfa3123e821fd5bfd6262d2161d80ee4b06c',
remotes = {'"wupper3.freifunk-troisdorf.de" port 53840'},
},
wupper4 = {
key = '5e7fa122990dbc34b8cae7ece2cd4ef919d3f8c23a674b7bbcf05bfebe6a6e8a',
remotes = {'"wupper4.freifunk-troisdorf.de" port 53840'},
},
gateway2 = {
key = '9154293d90bb907a647338585da4ddf283e534a948a0bb73ca604391fdd4aa0b',
remotes = {'"gateway2.freifunk-troisdorf.de" port 53840'},
groups = {
wupper = {
limit = 1,
peers = {
wupper0 = {
key = '7142f897f4e55d2c19207aa59db92ec54d7517cf558d5ecaef33689234952a4b',
remotes = {'"wupper0.freifunk-troisdorf.de" port 53840'},
},
wupper1 = {
key = '6eae041199ee627689bfa026afbd8a9ab299eca8aed4144321d098cffd62668e',
remotes = {'"wupper1.freifunk-troisdorf.de" port 53840'},
},
wupper2 = {
key = 'b7f319d59d8383ba813c3503416bca45f70852e4d207b1743bb6cdca1e30d9f5',
remotes = {'"wupper2.freifunk-troisdorf.de" port 53840'},
},
wupper3 = {
key = 'c8f3d1d10b0d6389e39c3c3cb08adfa3123e821fd5bfd6262d2161d80ee4b06c',
emotes = {'"wupper3.freifunk-troisdorf.de" port 53840'},
},
wupper4 = {
key = '5e7fa122990dbc34b8cae7ece2cd4ef919d3f8c23a674b7bbcf05bfebe6a6e8a',
remotes = {'"wupper4.freifunk-troisdorf.de" port 53840'},
},
},
},
troisdorf = {
limit = 1,
peers = {
gateway2 = {
key = '9154293d90bb907a647338585da4ddf283e534a948a0bb73ca604391fdd4aa0b',
remotes = {'"gateway2.freifunk-troisdorf.de" port 53840'},
},
},
},
},
},
},
},
autoupdater = {
enabled = true,
branch = 'stable',
@ -86,6 +94,7 @@ autoupdater = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14' -- Thorsten
},
},
@ -102,6 +111,7 @@ autoupdater = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14' -- Thorsten
},
},
experimental = {
@ -117,6 +127,7 @@ autoupdater = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14' -- Thorsten
},
},
},
@ -147,4 +158,4 @@ roles = {
tc_configs = {'fftro', 'freifunk'},
wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
},
}
}