From f9a6e70e3833c5f2ed5b3e2955f695061c0e40e5 Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Thu, 4 Jul 2019 03:42:36 +0200 Subject: [PATCH] geno playground --- .gitmodules | 2 +- gluon | 2 +- modules | 2 +- site.conf | 18 +++++++++++++++++- site.mk | 7 +------ 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8d6cc9d..9254b7b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "gluon"] path = gluon - url = https://github.com/freifunk-gluon/gluon.git + url = https://github.com/FreifunkBremen/gluon.git diff --git a/gluon b/gluon index 800c3b2..fda7ca4 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit 800c3b2bacdf3175b153413adc15ccdf802de2c8 +Subproject commit fda7ca4689636dc14137fa2701c0f9087073eb15 diff --git a/modules b/modules index 6893632..9c0183f 100644 --- a/modules +++ b/modules @@ -1,5 +1,5 @@ GLUON_SITE_FEEDS='ffhb' PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git -PACKAGES_FFHB_COMMIT=3245f2657691e58bda3fe0f1f6fd38bc8886c860 +PACKAGES_FFHB_COMMIT=e148f20c065e779aabab9037ed88717bf25508a0 PACKAGES_FFHB_BRANCH=events diff --git a/site.conf b/site.conf index 5825f8e..3f2c078 100644 --- a/site.conf +++ b/site.conf @@ -28,7 +28,7 @@ wifi24 = { channel = 5, ap = { - ssid = 'bremen.freifunk.net', + ssid = 'freifunk.net', }, -- mesh = { -- id = 'mesh.n.ffhb.de', @@ -85,6 +85,22 @@ }, }, }, + wireguard = { + configurable = true, + enabled = true, + groups = { + backbone = { + limit = 1, + peers = { + events = { + key ='XA7WDD0pzgzxAGHNbbtcuDxxKJiX7x4ZCm/0XBKVOwM=', + remote = '185.117.213.249', + broker_port = '1501', + }, + }, + }, + }, + }, bandwidth_limit = { enabled = false, egress = 1800, diff --git a/site.mk b/site.mk index 856e0b0..9b9f25b 100755 --- a/site.mk +++ b/site.mk @@ -1,5 +1,4 @@ GLUON_SITE_PACKAGES := \ - gluon-mesh-batman-adv-15 \ gluon-respondd \ respondd-module-airtime \ gluon-autoupdater \ @@ -9,16 +8,12 @@ GLUON_SITE_PACKAGES := \ gluon-config-mode-mesh-vpn \ gluon-config-mode-geo-location \ gluon-config-mode-contact-info \ - gluon-ebtables-filter-multicast \ - gluon-ebtables-filter-ra-dhcp \ - gluon-ebtables-source-filter \ gluon-web-admin \ gluon-web-autoupdater \ gluon-web-mesh-vpn-fastd \ gluon-web-network \ gluon-web-wifi-config \ - gluon-radv-filterd \ - gluon-radvd \ + gluon-client-bridge \ gluon-setup-mode \ gluon-speedtest \ gluon-status-page \