split domains + add new domain for 11s+batman-version

This commit is contained in:
Martin/Geno 2019-10-01 19:00:18 +02:00
parent 1546810194
commit 74ad5c6ce9
4 changed files with 164 additions and 81 deletions

65
domains/ffhb.conf Normal file
View File

@ -0,0 +1,65 @@
{
domain_names = {
ffhb = 'Freifunk Bremen',
},
domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978',
prefix4 = '10.196.0.0/17',
prefix6 = 'fd2f:5119:0f2c::/64',
wifi24 = {
channel = 6,
ap = {
ssid = 'bremen.freifunk.net',
},
mesh = {
id = 'mesh.ffhb.de',
mcast_rate = 6000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'bremen.freifunk.net',
},
mesh = {
id = 'mesh.ffhb.de',
mcast_rate = 6000,
},
},
mesh = {
vxlan = false,
batman_adv = {
routing_algo = 'BATMAN_V',
},
},
next_node = {
name = {
'node.ffhb.de',
'node.bremen.freifunk.net',
},
ip4 = '10.196.0.127',
ip6 = 'fd2f:5119:0f2c::127',
mac = '16:41:95:40:f7:dc',
},
mesh_vpn = {
fastd = {
groups = {
backbone = {
limit = 1,
peers = {
vpn01 = {
key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f',
remotes = {'"vpn01.batv15.bremen.freifunk.net" port 50000', '"vpn01.batv15.ffhb.de" port 50000'},
},
},
},
},
},
},
}
-- vim: noet ts=4

91
domains/ffhb_legacy.conf Normal file
View File

@ -0,0 +1,91 @@
{
domain_names = {
ffhb_legacy = 'Freifunk Bremen Legacy (please not use)',
},
domain_seed = 'afed1fa501c37b74d98981cfb5d988b2363ac7248783752bd66865e064166016',
prefix4 = '10.196.0.0/17',
prefix6 = 'fd2f:5119:0f2c::/64',
wifi24 = {
channel = 6,
ap = {
ssid = 'bremen.freifunk.net',
},
ibss = {
ssid = 'mesh.ffhb.de',
bssid = '32:06:1C:1F:B9:E8',
mcast_rate = 6000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'bremen.freifunk.net',
},
ibss = {
ssid = 'mesh.ffhb.de',
bssid = '32:06:1C:1F:B9:E8',
mcast_rate = 6000,
},
},
mesh = {
vxlan = false,
batman_adv = {
routing_algo = 'BATMAN_IV_LEGACY',
},
},
next_node = {
name = {
'node.ffhb.de',
'node.bremen.freifunk.net',
},
ip4 = '10.196.0.127',
ip6 = 'fd2f:5119:0f2c::127',
mac = '16:41:95:40:f7:dc',
},
mesh_vpn = {
fastd = {
groups = {
backbone = {
limit = 1,
peers = {
vpn01 = {
key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f',
remotes = {'"vpn01.bremen.freifunk.net" port 50000', '"vpn01.ffhb.de" port 50000'},
},
vpn02 = {
key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c',
remotes = {'"vpn02.bremen.freifunk.net" port 50000', '"vpn02.ffhb.de" port 50000'},
},
vpn03 = {
key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b',
remotes = {'"vpn03.bremen.freifunk.net" port 50000', '"vpn03.ffhb.de" port 50000'},
},
vpn05 = {
key = '6cff5957231ca2936aabaa75ae5a7985f4077246b8956273b2ce2da559f344a9',
remotes = {'"vpn05.bremen.freifunk.net" port 50000', '"vpn05.ffhb.de" port 50000'},
},
vpn06 = {
key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3',
remotes = {'"vpn06.bremen.freifunk.net" port 50000', '"vpn06.ffhb.de" port 50000'},
},
},
},
},
},
},
domain_switch = {
target_domain = 'ffhb',
switch_after_offline_mins = 120,
switch_time = 1577836800, -- Wed Jan 1 00:00:00 2020 UTC
connection_check_targets = {
'2001:4860:4860::8888',
'2001:4860:4860::8844',
},
},
}
-- vim: noet ts=4

View File

@ -1,10 +1,7 @@
{
site_name = 'Freifunk Bremen',
site_code = 'ffhb',
domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978',
prefix4 = '10.196.0.0/17',
prefix6 = 'fd2f:5119:0f2c::/64',
default_domain = 'ffhb_legacy',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {
@ -16,53 +13,6 @@
},
regdom = 'DE',
wifi24 = {
channel = 6,
ap = {
ssid = 'bremen.freifunk.net',
},
ibss = {
ssid = 'mesh.ffhb.de',
bssid = '32:06:1C:1F:B9:E8',
mcast_rate = 6000,
},
--mesh = {
-- id = 'mesh.ffhb.de',
-- mcast_rate = 6000,
--},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'bremen.freifunk.net',
},
ibss = {
ssid = 'mesh.ffhb.de',
bssid = '32:06:1C:1F:B9:E8',
mcast_rate = 6000,
},
--mesh = {
-- id = 'mesh.ffhb.de',
-- mcast_rate = 6000,
--},
},
mesh = {
vxlan = false,
batman_adv = {
routing_algo = 'BATMAN_IV_LEGACY',
},
},
next_node = {
name = {
'node.ffhb.de',
'node.bremen.freifunk.net',
},
ip4 = '10.196.0.127',
ip6 = 'fd2f:5119:0f2c::127',
mac = '16:41:95:40:f7:dc',
},
dns = {
servers = {
'fd2f:5119:0f2c::1',
@ -72,39 +22,13 @@
'fd2f:5119:0f2c::6',
},
},
mesh_vpn = {
enabled = true,
mtu = 1280,
fastd = {
methods = {'salsa2012+umac'},
configurable = true,
groups = {
backbone = {
limit = 1,
peers = {
vpn01 = {
key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f',
remotes = {'"vpn01.bremen.freifunk.net" port 50000', '"vpn01.ffhb.de" port 50000'},
},
vpn02 = {
key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c',
remotes = {'"vpn02.bremen.freifunk.net" port 50000', '"vpn02.ffhb.de" port 50000'},
},
vpn03 = {
key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b',
remotes = {'"vpn03.bremen.freifunk.net" port 50000', '"vpn03.ffhb.de" port 50000'},
},
vpn05 = {
key = '6cff5957231ca2936aabaa75ae5a7985f4077246b8956273b2ce2da559f344a9',
remotes = {'"vpn05.bremen.freifunk.net" port 50000', '"vpn05.ffhb.de" port 50000'},
},
vpn06 = {
key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3',
remotes = {'"vpn06.bremen.freifunk.net" port 50000', '"vpn06.ffhb.de" port 50000'},
},
},
},
},
},
bandwidth_limit = {
enabled = false,

View File

@ -3,12 +3,13 @@ GLUON_FEATURES := \
ebtables-filter-multicast \
ebtables-filter-ra-dhcp \
ebtables-limit-arp \
mesh-batman-adv-14 \
mesh-batman-adv-15 \
mesh-vpn-fastd \
respondd \
status-page \
web-advanced \
web-wizard
web-wizard \
mesh-batman-adv-14
GLUON_SITE_PACKAGES := \
respondd-module-airtime \
@ -22,7 +23,8 @@ GLUON_SITE_PACKAGES := \
iwinfo \
iptables \
firewall \
haveged
haveged \
gluon-scheduled-domain-switch
# Allow overriding the these variables from the command line
GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))
@ -32,3 +34,4 @@ GLUON_DEPRECATED ?= upgrade
GLUON_LANGS ?= en de
GLUON_REGION ?= eu
GLUON_WLAN_MESH ?= ibss
GLUON_MULTIDOMAIN=1