bundles/opendkim/items.py

@@ -53,6 +53,27 @@ for domain in node.metadata.get('mailserver/domains'):
         **file_attributes,
         'content': node.metadata.get(f'opendkim/keys/{domain}/private'),
     }
+    # files[f'/etc/opendkim/keys/{domain}/mail.txt'] = {
+    #     **file_attributes,
+    #     'content_type': 'any',
+    # }
+    # actions[f'generate_{domain}_dkim_key'] = {
+    #     'command': (
+    #         f'sudo --user opendkim'
+    #         f' opendkim-genkey'
+    #         f' --selector=mail'
+    #         f' --directory=/etc/opendkim/keys/{domain}'
+    #         f' --domain={domain}'
+    #     ),
+    #     'unless': f'test -f /etc/opendkim/keys/{domain}/mail.private',
+    #     'needs': [
+    #         'svc_systemd:opendkim',
+    #         f'directory:/etc/opendkim/keys/{domain}',
+    #     ],
+    #     'triggers': [
+    #         'svc_systemd:opendkim:restart',
+    #     ],
+    # }
 
 svc_systemd['opendkim'] = {
     'needs': [

nodes/htz.mails.py

@@ -228,6 +228,11 @@
                         '10.0.228.0/24',
                     ],
                 },
+                'mseibert.mailman': {
+                    'allowed_ips': [
+                        '10.0.229.0/24',
+                    ],
+                },
                 'ovh.left4me': {},
             },
             'clients': {