From 3a04293007f53b31c9cf218882b5af63a547494d Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sat, 26 Jun 2021 13:58:35 +0200
Subject: [PATCH] wip

---
 bundles/nginx/files/site_template          | 3 ---
 bundles/nginx/items.py                     | 1 +
 bundles/systemd-networkd/files/resolv.conf | 2 +-
 groups/all.py                              | 3 +++
 nodes/htz.mails.py                         | 3 +--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/nginx/files/site_template b/bundles/nginx/files/site_template
index 06ddb38..597718a 100644
--- a/bundles/nginx/files/site_template
+++ b/bundles/nginx/files/site_template
@@ -51,9 +51,6 @@ server {
     add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
 % endif
 
-    resolver 8.8.8.8 8.8.4.4 valid=300s;
-    resolver_timeout 5s;
-
     access_log /var/log/nginx/access-${vhost}.log;
     error_log /var/log/nginx/error-${vhost}.log;
 
diff --git a/bundles/nginx/items.py b/bundles/nginx/items.py
index ce88e13..26943fc 100644
--- a/bundles/nginx/items.py
+++ b/bundles/nginx/items.py
@@ -69,6 +69,7 @@ for vhost, config in node.metadata.get('nginx/vhosts', {}).items():
             'create_access_log': config.get('access_log', node.metadata.get('nginx/access_log', False)),
             'php_version': node.metadata.get('php/version', ''),
             'vhost': vhost,
+            'nameservers': node.metadata.get('nameservers'),
             **config,
         },
         'needs': set(),
diff --git a/bundles/systemd-networkd/files/resolv.conf b/bundles/systemd-networkd/files/resolv.conf
index 8f9ee33..e4f8999 100644
--- a/bundles/systemd-networkd/files/resolv.conf
+++ b/bundles/systemd-networkd/files/resolv.conf
@@ -1,3 +1,3 @@
-% for nameserver in sorted(node.metadata.get('nameservers', {'9.9.9.10', '2620:fe::10'})):
+% for nameserver in sorted(node.metadata.get('nameservers')):
 nameserver ${nameserver}
 % endfor
diff --git a/groups/all.py b/groups/all.py
index 348263b..6cf2026 100644
--- a/groups/all.py
+++ b/groups/all.py
@@ -8,6 +8,9 @@
             'server': 'home.backups',
         },
         'dns': {},
+        'nameservers': [
+            '10.0.10.2',
+        ],
         'users': {
             'root': {
                 'authorized_keys': [
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 377f770..c52bc99 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -19,7 +19,6 @@
         'bind': {
             'domain': 'ns.sublimity.de',
             'zones': {
-                'mail2.sublimity.de': [],
                 'sublimity.de': [],
                 'freibrief.net': [],
                 'nadenau.net': [],
@@ -70,7 +69,7 @@
             },
         },
         'mailserver': {
-            'hostname': 'mail2.sublimity.de',
+            'hostname': 'mail.sublimity.de',
             'admin_email': 'postmaster@sublimity.de',
             'domains': [
                 'mail3.sublimity.de',