exchange site-config by multidomain-config

This commit is contained in:
2018-08-01 23:34:16 +02:00
parent 36edcdabac
commit 7f7a1b8710
37 changed files with 544 additions and 2291 deletions

View File

@@ -1,7 +1,8 @@
{
hostname_prefix = 'ffmuc-',
site_name = 'Freifunk München [ALT]',
site_name = 'Freifunk München',
site_code = 'ffmuc',
default_domain = 'ffmuc_welcome',
opkg = {
extra = {
@@ -9,13 +10,6 @@
},
},
-- 32 bytes of random data, encoded in hexadecimal
-- This data must be unique among all sites and domains!
domain_seed = '8f6cb3915d9cff8e556a88ee9326349b23a251e056465afbd9f5e5c01c86c7c7',
prefix4 = '10.80.32.0/19',
prefix6 = 'fdef:ffc0:4fff::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
@@ -27,32 +21,20 @@
channel = 6,
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
basic_rate = {6000, 9000, 18000, 36000, 54000},
ap = {
ssid = 'muenchen.freifunk.net',
mesh = {
mcast_rate = 12000,
},
--mesh = {
-- id = 'ffmuc-mesh',
-- mcast_rate = 12000,
--},
ibss = {
ssid = 'mesh.ffmuc',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'muenchen.freifunk.net',
mesh = {
mcast_rate = 12000,
},
--mesh = {
-- id = 'ffmuc-mesh',
-- mcast_rate = 12000,
--},
ibss = {
ssid = 'mesh.ffmuc',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
},
},
@@ -63,59 +45,7 @@
},
},
next_node = {
ip4 = '10.80.32.1',
ip6 = 'fdef:ffc0:4fff::1',
mac = '16:41:95:40:f7:dc',
},
mesh_vpn = {
mtu = 1280,
fastd = {
methods = {'salsa2012+umac'},
groups = {
backbone = {
limit = 1,
peers = {
gw01 = {
key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
remotes = {
'"gw01.ffmuc.net" port 10001',
'"gw01.freifunk-muenchen.de" port 10001',
},
},
gw02 = {
key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
remotes = {
'"gw02.ffmuc.net" port 10001',
'"gw02.freifunk-muenchen.de" port 10001',
},
},
gw03 = {
key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
remotes = {
'"gw03.ffmuc.net" port 10001',
'"gw03.freifunk-muenchen.de" port 10001',
},
},
gw04 = {
key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
remotes = {
'"gw04.ffmuc.net" port 10001',
'"gw04.freifunk-muenchen.de" port 10001',
},
},
gw05 = {
key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
remotes = {
'"gw05.ffmuc.net" port 10001',
'"gw05.freifunk-muenchen.de" port 10001',
},
},
},
},
},
},
bandwidth_limit = {
enabled = false,
egress = 1500,