Peer Groups Test 3 and removed Gluon_roles

This commit is contained in:
stebifan 2015-06-02 12:16:46 +02:00
parent c110c9e7b6
commit 486fd481e8

View File

@ -40,35 +40,40 @@
mtu = 1406, mtu = 1406,
groups = { groups = {
backbone = { backbone = {
limit = 2, limit = 1,
peers = { peers = {
wupper0 = { wupper0 = {
key = '7142f897f4e55d2c19207aa59db92ec54d7517cf558d5ecaef33689234952a4b', key = '7142f897f4e55d2c19207aa59db92ec54d7517cf558d5ecaef33689234952a4b',
remotes = {'"wupper0.freifunk-troisdorf.de" port 53840'}, remotes = {'"wupper0.freifunk-troisdorf.de" port 53840'},
}, },
wupper1 = { wupper1 = {
key = '6eae041199ee627689bfa026afbd8a9ab299eca8aed4144321d098cffd62668e', key = '6eae041199ee627689bfa026afbd8a9ab299eca8aed4144321d098cffd62668e',
remotes = {'"wupper1.freifunk-troisdorf.de" port 53840'}, remotes = {'"wupper1.freifunk-troisdorf.de" port 53840'},
}, },
wupper2 = { wupper2 = {
key = 'b7f319d59d8383ba813c3503416bca45f70852e4d207b1743bb6cdca1e30d9f5', key = 'b7f319d59d8383ba813c3503416bca45f70852e4d207b1743bb6cdca1e30d9f5',
remotes = {'"wupper2.freifunk-troisdorf.de" port 53840'}, remotes = {'"wupper2.freifunk-troisdorf.de" port 53840'},
}, },
wupper3 = { wupper3 = {
key = 'c8f3d1d10b0d6389e39c3c3cb08adfa3123e821fd5bfd6262d2161d80ee4b06c', key = 'c8f3d1d10b0d6389e39c3c3cb08adfa3123e821fd5bfd6262d2161d80ee4b06c',
remotes = {'"wupper3.freifunk-troisdorf.de" port 53840'}, remotes = {'"wupper3.freifunk-troisdorf.de" port 53840'},
}, },
wupper4 = { wupper4 = {
key = '5e7fa122990dbc34b8cae7ece2cd4ef919d3f8c23a674b7bbcf05bfebe6a6e8a', key = '5e7fa122990dbc34b8cae7ece2cd4ef919d3f8c23a674b7bbcf05bfebe6a6e8a',
remotes = {'"wupper4.freifunk-troisdorf.de" port 53840'}, remotes = {'"wupper4.freifunk-troisdorf.de" port 53840'},
}, },
gateway2 = {
key = '9154293d90bb907a647338585da4ddf283e534a948a0bb73ca604391fdd4aa0b',
remotes = {'"gateway2.freifunk-troisdorf.de" port 53840'},
}, },
}, },
}, troisdorf = {
}, limit = 1,
peers = {
gateway2 = {
key = '9154293d90bb907a647338585da4ddf283e534a948a0bb73ca604391fdd4aa0b',
remotes = {'"gateway2.freifunk-troisdorf.de" port 53840'},
},
},
}
},
}, },
autoupdater = { autoupdater = {
enabled = true, enabled = true,
@ -87,6 +92,7 @@ autoupdater = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14' -- Thorsten
}, },
}, },
@ -103,6 +109,7 @@ autoupdater = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14' -- Thorsten
}, },
}, },
experimental = { experimental = {
@ -118,19 +125,11 @@ autoupdater = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14' -- Thorsten
}, },
}, },
}, },
}, },
roles = {
default = 'node',
list = {
node = 'Normal Node',
test = 'Test Node',
backbone = 'Backbone Node',
service = 'Service Node',
},
},
simple_tc = { simple_tc = {
mesh_vpn = { mesh_vpn = {
ifname = 'mesh-vpn', ifname = 'mesh-vpn',