wip

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;
 

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(),

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

groups/all.py

@@ -8,6 +8,9 @@
             'server': 'home.backups',
         },
         'dns': {},
+        'nameservers': [
+            '10.0.10.2',
+        ],
         'users': {
             'root': {
                 'authorized_keys': [

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',