From c7089db4e96a08b619a37d90dab3c494c0da2fff Mon Sep 17 00:00:00 2001 From: stebifan Date: Fri, 20 Nov 2015 16:12:21 +0100 Subject: [PATCH] first l2tp tests on beta --- modules | 6 ++--- site.conf | 69 +++++++++++-------------------------------------------- site.mk | 6 +++-- 3 files changed, 20 insertions(+), 61 deletions(-) diff --git a/modules b/modules index cf81ae0..eaf6614 100644 --- a/modules +++ b/modules @@ -1,10 +1,8 @@ -GLUON_SITE_FEEDS='tro' +GLUON_SITE_FEEDS='tro ffrl' PACKAGES_TRO_REPO=https://github.com/Freifunk-Troisdorf/packages.git PACKAGES_TRO_COMMIT=e92ccaeebb53a8308bb2729721a77cebad0b3494 -GLUON_SITE_FEEDS='ffrl' - PACKAGES_ffrl_REPO=https://github.com/ffrl/ffrl-packages.git -PACKAGES_ffrl_COMMIT=dcfdc0d6b42c07a81e3456e249068cf1fe0e99b0 +PACKAGES_ffrl_COMMIT=0a8b47f6dbc175e61eb40a9a22b628a412b61599 diff --git a/site.conf b/site.conf index 52ab834..09eed56 100644 --- a/site.conf +++ b/site.conf @@ -34,61 +34,6 @@ 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'}, - }, - }, - } - }, - }, autoupdater = { enabled = true, branch = 'stable', @@ -157,6 +102,20 @@ 'service', }, }, + roguenets_filter = { + allowed_prefix4 = '10.188.0.0/16', + allowed_prefix6 = 'fda0:747e:ab29:7405::/64', + }, + tunneldigger_mesh_vpn = { + mtu = 1312, + brokers = { + 'troisdorf1.freifunk-troisdorf.de:53844', + 'troisdorf2.freifunk-troisdorf.de:53844', + 'troisdorf3.freifunk-troisdorf.de:53844', + 'troisdorf4.freifunk-troisdorf.de:53844', + 'troisdorf5.freifunk-troisdorf.de:53844', + 'troisdorf6.freifunk-troisdorf.de:53844'}, + }, simple_tc = { mesh_vpn = { ifname = 'mesh-vpn', diff --git a/site.mk b/site.mk index a51eb0b..8bdca35 100644 --- a/site.mk +++ b/site.mk @@ -8,18 +8,20 @@ GLUON_SITE_PACKAGES := \ gluon-config-mode-core \ gluon-config-mode-autoupdater \ gluon-config-mode-hostname \ - gluon-config-mode-mesh-vpn \ + gluon-config-mode-tunneldigger \ gluon-config-mode-geo-location \ gluon-config-mode-contact-info \ + gluon-migrate-vpn \ gluon-ebtables-filter-multicast \ gluon-ebtables-filter-ra-dhcp \ + gluon-ebtables-filter-roguenets \ gluon-luci-admin \ gluon-luci-autoupdater \ gluon-luci-portconfig \ gluon-luci-private-wifi \ gluon-luci-node-role \ gluon-next-node \ - gluon-mesh-vpn-fastd \ + gluon-mesh-vpn-tunneldigger \ gluon-radvd \ gluon-status-page \ iwinfo \