switch to batman-adv current version

This commit is contained in:
Martin/Geno 2019-07-03 22:12:07 +02:00
parent 159160b636
commit b347ff2a62
No known key found for this signature in database
GPG Key ID: 9D7D3C6BFF600C6A
5 changed files with 28 additions and 32 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "gluon"] [submodule "gluon"]
path = gluon path = gluon
url = https://github.com/FreifunkBremen/gluon.git url = https://github.com/freifunk-gluon/gluon.git

2
gluon

@ -1 +1 @@
Subproject commit 37fb7a1ede0ffc3119e15399c517f84e3c3d9ea7 Subproject commit 800c3b2bacdf3175b153413adc15ccdf802de2c8

12
modules
View File

@ -1,13 +1,5 @@
GLUON_SITE_FEEDS='ffhb ffffmpackages' GLUON_SITE_FEEDS='ffhb'
# Just till it is merged upstream
PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=aae659d48d29353194501e41c210120471f33a75
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
PACKAGES_FFHB_COMMIT=a2bab9895964354feddfe5d961d5b3d11430e604 PACKAGES_FFHB_COMMIT=3245f2657691e58bda3fe0f1f6fd38bc8886c860
PACKAGES_FFHB_BRANCH=events PACKAGES_FFHB_BRANCH=events
PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git
PACKAGES_FFFFMPACKAGES_COMMIT=10ede5aab68eb22c30b0f01fd34f61714ffc0f0b
PACKAGES_FFFFMPACKAGES_BRANCH=master

View File

@ -17,14 +17,11 @@
site_code = 'ffhb', site_code = 'ffhb',
domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978', domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978',
node_prefix6 = '2a06:8782:ffbb:bab0::/64', prefix6 = '2a06:8782:ffbb:bab0::/64',
prefix6 = '2a06:8782:ffbb:bab1::/64',
node_client_prefix6 = 'fd2f:5119:f2c::/64', -- just magic ula, if routed to legacy network
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = { ntp_servers = {
'4.ntp.bremen.freifunk.net', '9.ntp.bremen.freifunk.net',
}, },
regdom = 'DE', regdom = 'DE',
@ -49,35 +46,39 @@
-- }, -- },
}, },
mesh = {
vxlan = false,
},
next_node = { next_node = {
name = { name = {
'node.ffhb.de', 'node.ffhb.de',
'node.bremen.freifunk.net', 'node.bremen.freifunk.net',
}, },
ip6 = '2a06:8782:ffbb:bab1::127', ip6 = '2a06:8782:ffbb:bab0::127',
mac = '16:41:95:40:f7:dc', mac = '16:41:95:40:f7:dc',
}, },
dns = { dns = {
servers = { servers = {
'2a06:8782:ffbb:bab0::4', '2a06:8782:ffbb:bab0::9',
}, },
}, },
mesh_vpn = { mesh_vpn = {
enabled = true, enabled = false,
mtu = 1374, mtu = 1374,
wireguard = { fastd = {
configurable = true, configurable = true,
enabled = true, enabled = true,
groups = { groups = {
backbone = { backbone = {
limit = '1', -- currently unused limit = 1,
peers = { peers = {
vpn04 = { events = {
enabled = true, enabled = true,
key ='ih0oVlwTSI1TfsKSxDW5hS3i3jaIsuk75Uh8/J3mQxw=', key = '865b1ac1ad8dafe79647b0ac92a9d2ebf456995e39b4de6d93ff585b83dfdb8a',
remote = 'vpn04.bremen.freifunk.net', remotes = {'"185.117.213.249" port 1500'},
broker_port = '40999',
}, },
}, },
}, },

15
site.mk
View File

@ -1,6 +1,5 @@
GLUON_SITE_PACKAGES := \ GLUON_SITE_PACKAGES := \
gluon-mesh-babel \ gluon-mesh-batman-adv-15 \
gluon-l3roamd \
gluon-respondd \ gluon-respondd \
respondd-module-airtime \ respondd-module-airtime \
gluon-autoupdater \ gluon-autoupdater \
@ -10,11 +9,15 @@ GLUON_SITE_PACKAGES := \
gluon-config-mode-mesh-vpn \ gluon-config-mode-mesh-vpn \
gluon-config-mode-geo-location \ gluon-config-mode-geo-location \
gluon-config-mode-contact-info \ gluon-config-mode-contact-info \
gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \
gluon-ebtables-source-filter \
gluon-web-admin \ gluon-web-admin \
gluon-web-autoupdater \ gluon-web-autoupdater \
gluon-web-mesh-vpn-fastd \
gluon-web-network \ gluon-web-network \
gluon-web-wifi-config \ gluon-web-wifi-config \
gluon-client-bridge \ gluon-radv-filterd \
gluon-radvd \ gluon-radvd \
gluon-setup-mode \ gluon-setup-mode \
gluon-speedtest \ gluon-speedtest \
@ -22,18 +25,18 @@ GLUON_SITE_PACKAGES := \
iputils-ping6 \ iputils-ping6 \
iwinfo \ iwinfo \
iptables \ iptables \
gluon-iptables-clamp-mss-to-pmtu \ firewall \
babeldev \
haveged \ haveged \
ffhb-breminale \
gluon-authorized-keys \ gluon-authorized-keys \
respondd-module-wifisettings \ respondd-module-wifisettings \
ffhb-breminale \
reghack reghack
# Allow overriding the these variables from the command line # Allow overriding the these variables from the command line
GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+)) GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))
export GLUON_BRANCH ?= babel export GLUON_BRANCH ?= babel
GLUON_PRIORITY ?= 0 GLUON_PRIORITY ?= 0
GLUON_DEPRECATED ?= 0
GLUON_LANGS ?= en de GLUON_LANGS ?= en de
GLUON_REGION ?= eu GLUON_REGION ?= eu
GLUON_WLAN_MESH ?= 11s GLUON_WLAN_MESH ?= 11s