diff --git a/domains/ffhb_11s.conf b/domains/ffhb_11s.conf new file mode 100644 index 0000000..0d10f46 --- /dev/null +++ b/domains/ffhb_11s.conf @@ -0,0 +1,81 @@ +{ + domain_names = { + ffhb_11s = 'Freifunk Bremen (with 11s Support)', + }, + domain_seed = 'afed1fa501c37b74d98981cfb5d988b2363ac7248783752bd66865e064166016', + + 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_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'}, + }, + }, + }, + }, + }, + }, +} + +-- vim: noet ts=4 diff --git a/domains/ffhb_legacy.conf b/domains/ffhb_legacy.conf index 8c9fc3e..a0ae58e 100644 --- a/domains/ffhb_legacy.conf +++ b/domains/ffhb_legacy.conf @@ -78,9 +78,9 @@ }, }, domain_switch = { - target_domain = 'ffhb', + target_domain = 'ffhb_11s', switch_after_offline_mins = 120, - switch_time = 1577836800, -- Wed Jan 1 00:00:00 2020 UTC + switch_time = 1583366400, -- Thu Mar 5 00:00:00 2020 UTC connection_check_targets = { '2001:4860:4860::8888', '2001:4860:4860::8844',