diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py index 89dc01d..c033591 100644 --- a/nodes/htz.mails.py +++ b/nodes/htz.mails.py @@ -52,6 +52,7 @@ 'left4.me', 'elimu-kwanza.de', 'cronekorkn.de', + 'direkt.oranienschule.de', 'foerderkreis.oranienschule-wiesbaden-wiki.de', }, }, diff --git a/nodes/mseibert.yourls.py b/nodes/mseibert.yourls.py index d0d08c3..7f9e11a 100644 --- a/nodes/mseibert.yourls.py +++ b/nodes/mseibert.yourls.py @@ -4,13 +4,13 @@ { 'hostname': '168.119.250.114', 'groups': [ - #'backup', + 'backup', 'debian-12', - #'monitored', + 'monitored', 'webserver', ], 'bundles': [ - #'wireguard', + 'wireguard', 'mariadb', 'php', 'yourls', @@ -21,7 +21,7 @@ 'network': { 'internal': { 'interface': 'ens10', - 'ipv4': '10.0.227.4/24', + 'ipv4': '10.0.228.2/24', }, 'external': { 'interface': 'eth0', @@ -40,13 +40,26 @@ }, }, # FIXME: - 'overwrite_nameservers': [ - '8.8.8.8', - ], + # 'overwrite_nameservers': [ + # '8.8.8.8', + # ], 'vm': { 'cores': 2, 'ram': 4096, }, + 'wireguard': { + 'my_ip': '172.30.0.239/32', + 's2s': { + 'htz.mails': { + 'allowed_ips': [ + '10.0.0.0/24', + '10.0.2.0/24', + '10.0.9.0/24', + '10.0.10.0/24', + ], + }, + }, + }, 'zfs': { 'pools': { 'tank': {