Commit a3c63863 authored by Georg von Zengen's avatar Georg von Zengen

Merge 'beta'

parents 7a4fff14 053c1c70
......@@ -19,8 +19,6 @@
mesh_mcast_rate = 12000,
aliases = {
'Freifunk',
'freifunk.net',
'braunschweig.freifunk.net',
}
},
wifi5 = {
......@@ -32,8 +30,6 @@
mesh_mcast_rate = 12000,
aliases = {
'Freifunk',
'freifunk.net',
'braunschweig.freifunk.net',
}
},
......@@ -45,7 +41,7 @@
},
fastd_mesh_vpn = {
methods = {'salsa2012+gmac'},
methods = {'salsa2012+umac'},
mtu = 1426,
enabled = True,
groups = {
......@@ -54,7 +50,7 @@
peers = {
gw03 = {
key = '872cac3b00096a8ee763e80df2be331ba1ffa5dbe00d1e025a85d25c3cee82fb',
remotes = {'ipv4 "gw03.freifunk-bs.de" port 10000'},
remotes = {'ipv4 "gw03.freifunk-bs.de" port 10001'},
},
unicorn = {
key = '1b3d401d841a1496970f1f7abc6fe21c01bfdc6cf391835d91a6798250ea8faf',
......@@ -63,7 +59,7 @@
},
gw01 = {
key = 'c7b3985fa8efbcf0f79f29ad62a30bfcf35e6b115e4caeb258f4f5b6b7264c9f',
remotes = {'ipv4 "gw01.freifunk-bs.de" port 10000'},
remotes = {'ipv4 "gw01.freifunk-bs.de" port 10001'},
},
},
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment