bin/script-template

@@ -4,3 +4,13 @@ from bundlewrap.repo import Repository
 from os.path import realpath, dirname
 
 repo = Repository(dirname(dirname(realpath(__file__))))
+domains = set()
+
+for node in repo.nodes:
+    domains.update(
+        set(node.metadata.get('opendkim/domains', []))
+    )
+
+print(domains)
+
+# Do in Metaproc

bundles/mailserver/metadata.py

@@ -1,5 +1,3 @@
-from ipaddress import ip_interface
-
 database_password = repo.vault.password_for(f'{node.name} db mailserver')
 
 defaults = {
@@ -12,7 +10,6 @@ defaults = {
             'password': database_password,
         },
         'test_password': repo.vault.password_for(f'{node.name} test_pw mailserver'),
-        'domains': [],
     },
     'postgresql': {
         'roles': {
@@ -36,24 +33,6 @@ defaults = {
     },
 }
 
-
-@metadata_reactor.provides(
-    'dns',
-)
-def dns(metadata):
-    dns = {}
-    
-    for domain in metadata.get('mailserver/domains'):
-        dns[domain] = {
-            'MX': [
-                str(ip_interface(metadata.get('network/ipv4')).ip)
-            ],
-        }
-
-    return {
-        'dns': dns,
-    }
-
 @metadata_reactor.provides(
     'letsencrypt/domains',
 )

bundles/network/metadata.py

@@ -5,28 +5,23 @@ from ipaddress import ip_interface
     'interfaces',
 )
 def interfaces(metadata):
-    interface = {
-        'ips': [],
-    }
-    
-    if metadata.get('network/ipv4', None):
-        interface['ips'].append(metadata.get('network/ipv4'))
-        interface['gateway4'] = metadata.get('network/gateway4')
-    
-    if metadata.get('network/ipv6', None):
-        interface['ips'].append(metadata.get('network/ipv6'))
-        interface['gateway6'] = metadata.get('network/gateway6')
-    
     return {
         'interfaces': {
-            metadata.get('network/interface'): interface,
+            metadata.get('network/interface'): {
+                'ips': list(filter(None.__ne__, [
+                    metadata.get('network/ipv4', None),
+                    metadata.get('network/ipv6', None),
+                ])),
+                'gateway4': metadata.get('network/gateway4', None),
+                'gateway6': metadata.get('network/gateway6', None),
+            },
         }
     }
 
 
 @metadata_reactor.provides(
-    'network/gateway4',
+    'interfaces/gateway4',
-    'network/gateway6',
+    'interfaces/gateway6',
 )
 def guess_gateway(metadata):
     if metadata.get('network/gateway4', None):

bundles/nginx/metadata.py

@@ -1,4 +1,5 @@
 from ipaddress import ip_interface
+from bundlewrap.metadata import atomic
 
 defaults = {
     'apt': {

bundles/opendkim/items.py

@@ -32,20 +32,20 @@ files = {
     '/etc/opendkim/key_table': {
         'content_type': 'mako',
         'context': {
-            'domains': node.metadata.get('mailserver/domains'),
+            'domains': node.metadata.get('opendkim/domains'),
         },
         **file_attributes,
     },
     '/etc/opendkim/signing_table': {
         'content_type': 'mako',
         'context': {
-            'domains': node.metadata.get('mailserver/domains'),
+            'domains': node.metadata.get('opendkim/domains'),
         },
         **file_attributes,
     },
 }
 
-for domain in node.metadata.get('mailserver/domains'):
+for domain in node.metadata.get('opendkim/domains'):
     directories[f'/etc/opendkim/keys/{domain}'] = {
         **file_attributes,
         'purge': True,

bundles/opendkim/metadata.py

@@ -13,6 +13,7 @@ defaults = {
         },
     },
     'opendkim': {
+        'domains': [],
         'keys': {},
     },
     'dns': {
@@ -31,7 +32,7 @@ defaults = {
 def keys(metadata):
     keys = {}
     
-    for domain in metadata.get('mailserver/domains'):
+    for domain in metadata.get('opendkim/domains'):
         if domain in metadata.get(f'opendkim/keys'):
             continue
         

groups/all.py

@@ -1 +0,0 @@
-{}

groups/os/linux.py

@@ -1,7 +1,4 @@
 {
-    'supergroups': [
-        'all',
-    ],
     'bundles': [
         'network',
         'systemd',

nodes/htz.mails.py

@@ -37,6 +37,8 @@
         'mailserver': {
             'hostname': 'mail2.sublimity.de',
             'admin_email': 'postmaster@sublimity.de',
+        },
+        'opendkim': {
             'domains': [
                 'mail2.sublimity.de',
                 # 'sublimity.de',