diff --git a/site.conf b/site.conf index 0b74f7d..472b34e 100644 --- a/site.conf +++ b/site.conf @@ -50,67 +50,11 @@ ip6 = 'fda0:747e:ab29:7405::1', mac = '04:74:05:d0:4f:aa', }, - fastd_mesh_vpn = { - methods = { - 'salsa2012+umac', - 'salsa2012+gmac' - }, - mtu = 1312, - groups = { - backbone = { - limit = 1, - peers = { - wupper0 = { - key = '7142f897f4e55d2c19207aa59db92ec54d7517cf558d5ecaef33689234952a4b', - remotes = {'"wupper0.freifunk-troisdorf.de" port 53842'}, - }, - wupper1 = { - key = '6eae041199ee627689bfa026afbd8a9ab299eca8aed4144321d098cffd62668e', - remotes = {'"wupper1.freifunk-troisdorf.de" port 53842'}, - }, - wupper2 = { - key = 'b7f319d59d8383ba813c3503416bca45f70852e4d207b1743bb6cdca1e30d9f5', - remotes = {'"wupper2.freifunk-troisdorf.de" port 53842'}, - }, - wupper3 = { - key = 'c8f3d1d10b0d6389e39c3c3cb08adfa3123e821fd5bfd6262d2161d80ee4b06c', - remotes = {'"wupper3.freifunk-troisdorf.de" port 53842'}, - }, - wupper4 = { - key = '5e7fa122990dbc34b8cae7ece2cd4ef919d3f8c23a674b7bbcf05bfebe6a6e8a', - remotes = {'"wupper4.freifunk-troisdorf.de" port 53842'}, - }, - }, - }, - troisdorf = { - limit = 1, - peers = { - troisdorf1 = { - key = '4246ddd370bb12a4b371d6cfab4e00591361eac1a1a9f1f962725823a302eb8f', - remotes = {'"troisdorf1.freifunk-troisdorf.de" port 53842'}, - }, - troisdorf2 = { - key = 'fab9b346a16eead4077a792076fb9ccd7738f959d7654567440c9192ad0d2bec', - remotes = {'"troisdorf2.freifunk-troisdorf.de" port 53842'}, - }, - troisdorf3 = { - key = 'd45d3b0f660dbdb610514d7236c0b1a7f7c6c03eb2e3a517f45dd8a01a39a9fa', - remotes = {'"troisdorf3.freifunk-troisdorf.de" port 53842'}, - }, - troisdorf4 = { - key = '25abce5516c6cdb1782773f77158eb7b1234e7ca12d2c6603d5696b441415b8c', - remotes = {'"troisdorf4.freifunk-troisdorf.de" port 53842'}, - }, - }, - } - }, - }, - - mesh = { + mesh = { batman_adv = { gw_sel_class = 3, - }, - }, + }, + }, autoupdater = { enabled = true, branch = 'stable', @@ -187,12 +131,4 @@ 'service', }, }, - simple_tc = { - mesh_vpn = { - ifname = 'mesh-vpn', - enabled = false, - limit_egress = 300, - limit_ingress = 5000, - }, - }, }