From 3fbf28025248b74b496d215899d6a9cfc83791d2 Mon Sep 17 00:00:00 2001 From: genofire Date: Sun, 22 May 2022 12:15:12 +0200 Subject: [PATCH] fix(sites): dns and ntp per site --- domains/ffhb_11s.conf | 17 +++++++++++++++++ domains/ffhb_batv15.conf | 11 +++++++++++ domains/ffhb_legacy.conf | 17 +++++++++++++++++ site.conf | 17 ----------------- 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/domains/ffhb_11s.conf b/domains/ffhb_11s.conf index 93b832b..6fc546d 100644 --- a/domains/ffhb_11s.conf +++ b/domains/ffhb_11s.conf @@ -4,6 +4,23 @@ }, domain_seed = 'afed1fa501c37b74d98981cfb5d988b2363ac7248783752bd66865e064166016', + ntp_servers = { + '1.ntp.bremen.freifunk.net', + '2.ntp.bremen.freifunk.net', + '3.ntp.bremen.freifunk.net', + '5.ntp.bremen.freifunk.net', + '6.ntp.bremen.freifunk.net', + }, + dns = { + servers = { + 'fd2f:5119:0f2c::1', + 'fd2f:5119:0f2c::2', + 'fd2f:5119:0f2c::3', + 'fd2f:5119:0f2c::5', + 'fd2f:5119:0f2c::6', + }, + }, + prefix4 = '10.196.0.0/17', prefix6 = 'fd2f:5119:0f2c::/64', diff --git a/domains/ffhb_batv15.conf b/domains/ffhb_batv15.conf index ae5d8d7..b6d2054 100644 --- a/domains/ffhb_batv15.conf +++ b/domains/ffhb_batv15.conf @@ -5,6 +5,17 @@ hide_domain = true, domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978', + ntp_servers = { + '7.ntp.bremen.freifunk.net', + '8.ntp.bremen.freifunk.net', + }, + dns = { + servers = { + 'fd2f:5119:0f2c::7', + 'fd2f:5119:0f2c::8', + }, + }, + prefix4 = '10.196.0.0/17', prefix6 = 'fd2f:5119:0f2c::/64', diff --git a/domains/ffhb_legacy.conf b/domains/ffhb_legacy.conf index 129a519..959db39 100644 --- a/domains/ffhb_legacy.conf +++ b/domains/ffhb_legacy.conf @@ -5,6 +5,23 @@ hide_domain = true, domain_seed = 'afed1fa501c37b74d98981cfb5d988b2363ac7248783752bd66865e064166016', + ntp_servers = { + '1.ntp.bremen.freifunk.net', + '2.ntp.bremen.freifunk.net', + '3.ntp.bremen.freifunk.net', + '5.ntp.bremen.freifunk.net', + '6.ntp.bremen.freifunk.net', + }, + dns = { + servers = { + 'fd2f:5119:0f2c::1', + 'fd2f:5119:0f2c::2', + 'fd2f:5119:0f2c::3', + 'fd2f:5119:0f2c::5', + 'fd2f:5119:0f2c::6', + }, + }, + prefix4 = '10.196.0.0/17', prefix6 = 'fd2f:5119:0f2c::/64', diff --git a/site.conf b/site.conf index ad154cb..6a35bd2 100644 --- a/site.conf +++ b/site.conf @@ -4,25 +4,8 @@ default_domain = 'ffhb_11s', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - ntp_servers = { - '1.ntp.bremen.freifunk.net', - '2.ntp.bremen.freifunk.net', - '3.ntp.bremen.freifunk.net', - '5.ntp.bremen.freifunk.net', - '6.ntp.bremen.freifunk.net', - }, regdom = 'DE', - dns = { - servers = { - 'fd2f:5119:0f2c::1', - 'fd2f:5119:0f2c::2', - 'fd2f:5119:0f2c::3', - 'fd2f:5119:0f2c::5', - 'fd2f:5119:0f2c::6', - }, - }, - mesh_vpn = { enabled = true, mtu = 1280,