replace fastd with wireguard (+ ssid to ng-bremen.freifunk.net)
This commit is contained in:
parent
1b692afab6
commit
bf33967a55
|
@ -1,3 +1,3 @@
|
||||||
[submodule "gluon"]
|
[submodule "gluon"]
|
||||||
path = gluon
|
path = gluon
|
||||||
url = https://github.com/freifunk-ffm/gluon.git
|
url = https://github.com/christf/gluon.git
|
||||||
|
|
2
gluon
2
gluon
|
@ -1 +1 @@
|
||||||
Subproject commit 25e0cb266a4a0b391c69b231c6bf84f73c0507a1
|
Subproject commit c4c05b7d86dba7c742e4c421945213b0039e8348
|
8
modules
8
modules
|
@ -1,12 +1,8 @@
|
||||||
GLUON_SITE_FEEDS='ffhb ffffmpackages ffmgpackages'
|
GLUON_SITE_FEEDS='ffhb ffffmpackages'
|
||||||
|
|
||||||
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
|
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
|
||||||
PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a
|
PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a
|
||||||
|
|
||||||
PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git
|
PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git
|
||||||
PACKAGES_FFFFMPACKAGES_COMMIT=9999a19165011c25d9fcb2f14ad668ebf1865b90
|
PACKAGES_FFFFMPACKAGES_COMMIT=10ede5aab68eb22c30b0f01fd34f61714ffc0f0b
|
||||||
PACKAGES_FFFFMPACKAGES_BRANCH=master
|
PACKAGES_FFFFMPACKAGES_BRANCH=master
|
||||||
|
|
||||||
PACKAGES_FFMGPACKAGES_REPO=git://github.com/freifunk-ffm/packages-1.git
|
|
||||||
PACKAGES_FFMGPACKAGES_COMMIT=135478fec65e2218179a5db74797c78de00c6994
|
|
||||||
PACKAGES_FFMGPACKAGES_BRANCH=mmfd
|
|
||||||
|
|
31
site.conf
31
site.conf
|
@ -3,6 +3,7 @@
|
||||||
site_code = 'ffhb',
|
site_code = 'ffhb',
|
||||||
domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978',
|
domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978',
|
||||||
|
|
||||||
|
prefix4 = '10.196.0.0/17', -- workaround to get l3roamd running
|
||||||
prefix6 = '2a06:8782:ffbb:bab1::/64', -- (freifunk wide ip)
|
prefix6 = '2a06:8782:ffbb:bab1::/64', -- (freifunk wide ip)
|
||||||
node_prefix6 = '2a06:8782:ffbb:bab0::/64', -- (freifunk wide inter node ip)
|
node_prefix6 = '2a06:8782:ffbb:bab0::/64', -- (freifunk wide inter node ip)
|
||||||
node_client_prefix6 = 'fd2f:5119:f2c::/64', -- infrastructure net (ULA) for node-client-ip addresses (node wide ip)
|
node_client_prefix6 = 'fd2f:5119:f2c::/64', -- infrastructure net (ULA) for node-client-ip addresses (node wide ip)
|
||||||
|
@ -20,7 +21,7 @@
|
||||||
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
|
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
|
||||||
basic_rate = {6000, 9000, 18000, 36000, 54000},
|
basic_rate = {6000, 9000, 18000, 36000, 54000},
|
||||||
ap = {
|
ap = {
|
||||||
ssid = 'babel.freifunk.net',
|
ssid = 'ng-bremen.freifunk.net',
|
||||||
},
|
},
|
||||||
mesh = {
|
mesh = {
|
||||||
id = 'meshb.ffhb.de',
|
id = 'meshb.ffhb.de',
|
||||||
|
@ -30,7 +31,7 @@
|
||||||
wifi5 = {
|
wifi5 = {
|
||||||
channel = 44,
|
channel = 44,
|
||||||
ap = {
|
ap = {
|
||||||
ssid = 'babel.freifunk.net',
|
ssid = 'ng-bremen.freifunk.net',
|
||||||
},
|
},
|
||||||
mesh = {
|
mesh = {
|
||||||
id = 'meshb.ffhb.de',
|
id = 'meshb.ffhb.de',
|
||||||
|
@ -54,22 +55,7 @@
|
||||||
|
|
||||||
mesh_vpn = {
|
mesh_vpn = {
|
||||||
enabled = true,
|
enabled = true,
|
||||||
mtu = 1280,
|
mtu = 1374,
|
||||||
fastd = {
|
|
||||||
methods = {'salsa2012+umac'},
|
|
||||||
configurable = true,
|
|
||||||
groups = {
|
|
||||||
backbone = {
|
|
||||||
limit = 1,
|
|
||||||
peers = {
|
|
||||||
vpn04 = {
|
|
||||||
key = '6714e89d253d260848abbd3419f6226ef8d76c64a37d300acfc13016bcad6395',
|
|
||||||
remotes = {'"vpn04.bremen.freifunk.net" port 50001', '"vpn04.ffhb.de" port 50001'},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
wireguard = {
|
wireguard = {
|
||||||
configurable = true,
|
configurable = true,
|
||||||
enabled = true,
|
enabled = true,
|
||||||
|
@ -78,11 +64,10 @@
|
||||||
limit = '1', -- currently unused
|
limit = '1', -- currently unused
|
||||||
peers = {
|
peers = {
|
||||||
vpn04 = {
|
vpn04 = {
|
||||||
iface = 'wg-mesh-vpn04',
|
enabled = true,
|
||||||
enabled = '1',
|
key ='ih0oVlwTSI1TfsKSxDW5hS3i3jaIsuk75Uh8/J3mQxw=',
|
||||||
PublicKey ='ih0oVlwTSI1TfsKSxDW5hS3i3jaIsuk75Uh8/J3mQxw=',
|
remote = 'vpn04.bremen.freifunk.net',
|
||||||
remote = 'vpn04.bremen.freifunk.net:41000',
|
broker_port = '40999',
|
||||||
broker = 'vpn04.bremen.freifunk.net:40999',
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
9
site.mk
9
site.mk
|
@ -12,12 +12,9 @@ GLUON_SITE_PACKAGES := \
|
||||||
gluon-config-mode-contact-info \
|
gluon-config-mode-contact-info \
|
||||||
gluon-web-admin \
|
gluon-web-admin \
|
||||||
gluon-web-autoupdater \
|
gluon-web-autoupdater \
|
||||||
gluon-web-mesh-vpn-fastd \
|
|
||||||
gluon-web-mesh-vpn-wireguard \
|
|
||||||
gluon-web-network \
|
gluon-web-network \
|
||||||
gluon-web-private-wifi \
|
gluon-web-private-wifi \
|
||||||
gluon-web-wifi-config \
|
gluon-web-wifi-config \
|
||||||
gluon-mesh-vpn-fastd \
|
|
||||||
gluon-mesh-vpn-wireguard \
|
gluon-mesh-vpn-wireguard \
|
||||||
gluon-client-bridge \
|
gluon-client-bridge \
|
||||||
gluon-radvd \
|
gluon-radvd \
|
||||||
|
@ -48,9 +45,3 @@ ifeq ($(GLUON_TARGET),x86-64)
|
||||||
GLUON_SITE_PACKAGES += \
|
GLUON_SITE_PACKAGES += \
|
||||||
$(DEBUG_PACKAGES)
|
$(DEBUG_PACKAGES)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# digineo
|
|
||||||
ifeq ($(GLUON_TARGET),ramips-mt7621)
|
|
||||||
GLUON_SITE_PACKAGES += \
|
|
||||||
$(DEBUG_PACKAGES)
|
|
||||||
endif
|
|
||||||
|
|
Loading…
Reference in New Issue