wip

bundles/letsencrypt/metadata.py

@@ -7,7 +7,9 @@ defaults = {
         },
     },
     'letsencrypt': {
-        'domains': {},
+        'domains': {
+            # 'example.com': {'alias1.example.com', 'alias2.example.com'},
+        },
     },
     'pacman': {
         'packages': {
@@ -52,7 +54,7 @@ def delegated_domains(metadata):
     return {
         'letsencrypt': {
             'domains': {
-                domain: {}
+                domain: set()
                     for other_node in repo.nodes
                     if other_node.has_bundle('letsencrypt')
                         and other_node.metadata.get('letsencrypt/delegate_to_node', None) == node.name

bundles/nginx/metadata.py

@@ -104,7 +104,7 @@ def letsencrypt(metadata):
     return {
         'letsencrypt': {
             'domains': {
-                domain: {} for domain in metadata.get('nginx/vhosts')
+                domain: set() for domain in metadata.get('nginx/vhosts')
             },
             'reload_after': {
                 'nginx',

nodes/htz.mails.py

@@ -32,17 +32,17 @@
         'bind': {
             'hostname': 'resolver.name',
             'zones': {
-                'sublimity.de': [],
+                'sublimity.de': {},
-                'freibrief.net': [],
+                'freibrief.net': {},
-                'nadenau.net': [],
+                'nadenau.net': {},
-                'naeder.net': [],
+                'naeder.net': {},
-                'rolfwerner.eu': [],
+                'rolfwerner.eu': {},
-                'wettengl.net': [],
+                'wettengl.net': {},
-                'wingl.de': [],
+                'wingl.de': {},
-                'woodpipe.de': [],
+                'woodpipe.de': {},
-                'ckn.li': [],
+                'ckn.li': {},
-                'islamicstate.eu': [],
+                'islamicstate.eu': {},
-                'hausamsilberberg.de': [],
+                'hausamsilberberg.de': {},
             },
         },
         'dns': {
@@ -61,9 +61,9 @@
         },
         'letsencrypt': {
             'domains': {
-                'ckn.li': {},
+                'ckn.li': set(),
-                'sublimity.de': {},
+                'sublimity.de': set(),
-                'freibrief.net': {},
+                'freibrief.net': set(),
             },
         },
         'mailserver': {