aliases

bundles/bind-acme/metadata.py

@@ -2,16 +2,19 @@
     'dns',
 )
 def acme_records(metadata):
-    if metadata.get('bind/type') == 'slave':
+    domains = set()
-        return {}
+    
-
+    for other_node in repo.nodes:
+        for domain, conf in other_node.metadata.get('letsencrypt/domains', {}).items():
+            domains.add(domain)
+            domains.update(conf.get('aliases', []))
+    
     return {
         'dns': {
             f'_acme-challenge.{domain}': {
                 'CNAME': {f"{domain}.{metadata.get('bind/acme_zone')}."},
             }
-                for other_node in repo.nodes
+                for domain in domains
-                for domain in other_node.metadata.get('letsencrypt/domains', {}).keys()
         }
     }
 
@@ -20,16 +23,13 @@ def acme_records(metadata):
     'bind/zones',
 )
 def acme_zone(metadata):
-    if metadata.get('bind/type') == 'slave':
-        return {}
-
     return {
         'bind': {
             'zones': {
                 metadata.get('bind/acme_zone'): {
                     'dynamic': True,
-                    'records': set(),
                     'views': ['external'],
+                    'records': set(),
                 },
             },
         },

bundles/letsencrypt/files/domains.txt

@@ -1,3 +1,3 @@
-% for domain, aliases in sorted(node.metadata.get('letsencrypt/domains', {}).items()):
+% for domain, conf in sorted(domains.items()):
-${domain} ${' '.join(sorted(aliases))}
+${domain} ${' '.join(sorted(conf.get('aliases', [])))}
 % endfor

bundles/letsencrypt/files/hook.sh

@@ -8,7 +8,7 @@ deploy_challenge() {
     zone ${zone}.
     update add $1.${zone}. 60 IN TXT \"$3\"
     send
-  " | tee | nsupdate -y hmac-sha512:acme.sublimity.de:${acme_key}
+  " | tee | nsupdate -y hmac-sha512:${zone}:${acme_key}
   
   sleep 10
 }
@@ -19,43 +19,37 @@ clean_challenge() {
     zone ${zone}.
     update delete $1.${zone}. TXT
     send
-  " | tee | nsupdate -y hmac-sha512:acme.sublimity.de:${acme_key}
+  " | tee | nsupdate -y hmac-sha512:${zone}:${acme_key}
 }
 
-deploy_cert() {<%text>
+deploy_cert() {
-    local DOMAIN="${1}" KEYFILE="${2}" CERTFILE="${3}" FULLCHAINFILE="${4}" CHAINFILE="${5}" TIMESTAMP="${6}"</%text>
+  DOMAIN="$1"
-% for service, config in node.metadata.get('letsencrypt/concat_and_deploy', {}).items():
+  KEYFILE="$2"
-
+  CERTFILE="$3"
-    # concat_and_deploy ${service}
+  FULLCHAINFILE="$4"
-    if [ "$DOMAIN" = "${config['match_domain']}" ]; then
+  CHAINFILE="$5"
-        cat $KEYFILE > ${config['target']}
+  
-        cat $FULLCHAINFILE >> ${config['target']}
+  % for domain, conf in sorted(domains.items()):
-%  if 'chown' in config:
+  % if conf.get('location', None):
-        chown ${config['chown']} ${config['target']}
+  if [[ $DOMAIN = ${domain} ]]
-%  endif
+  then
-%  if 'chmod' in config:
+    cat "$KEYFILE" > "${conf['location']}/privkey.pem"
-        chmod ${config['chmod']} ${config['target']}
+    cat "$CERTFILE" > "${conf['location']}/cert.pem"
-%  endif
+    cat "$FULLCHAINFILE" > "${conf['location']}/fullchain.pem"
-%  if 'commands' in config:
+    cat "$CHAINFILE" > "${conf['location']}/chain.pem"
-%   for command in config['commands']:
+  fi
-        ${command}
+  % endif
-%   endfor
+  % if conf.get('owner', None):
-%  endif
+  chown ${conf['owner']} "${conf['location']}/privkey.pem" "${conf['location']}/cert.pem" "${conf['location']}/fullchain.pem" "${conf['location']}/chain.pem"
-    fi
+  % endif
-% endfor
+  % for service in sorted(conf.get('reload', [])):
+  systemctl reload-or-restart ${service}
+  % endfor
+  % endfor
 }
 
-
-exit_hook() {<%text>
-    local ERROR="${1:-}"</%text>
-
-% for service in sorted(node.metadata.get('letsencrypt/reload_after', set())):
-    systemctl reload-or-restart ${service}
-% endfor
-}
-
-<%text>
 HANDLER="$1"; shift
-if [[ "${HANDLER}" =~ ^(deploy_cert|exit_hook|deploy_challenge|clean_challenge)$ ]]; then
+if [[ $HANDLER =~ ^(deploy_cert|deploy_challenge|clean_challenge)$ ]]
+then
     "$HANDLER" "$@"
-fi</%text>
+fi

bundles/letsencrypt/items.py

@@ -13,6 +13,9 @@ directories = {
 files = {
     '/etc/dehydrated/domains.txt': {
         'content_type': 'mako',
+        'context': {
+            'domains': node.metadata.get('letsencrypt/domains'),
+        },
         'triggers': {
             'action:letsencrypt_update_certificates',
         },
@@ -28,6 +31,7 @@ files = {
             'server': ip_interface(acme_node.metadata.get('network/external/ipv4')).ip,
             'zone': acme_node.metadata.get('bind/acme_zone'),
             'acme_key': acme_node.metadata.get('bind/keys/' + acme_node.metadata.get('bind/acme_zone')),
+            'domains': node.metadata.get('letsencrypt/domains'),
         },
         'mode': '0755',
     },

bundles/letsencrypt/metadata.py

@@ -53,22 +53,19 @@ def renew(metadata):
 )
 def delegated_domains(metadata):
     delegated_domains = {
-        domain
+        domain: conf
             for other_node in repo.nodes
             if other_node.has_bundle('letsencrypt')
-                and other_node.metadata.get('letsencrypt/delegate_to_node', None) == node.name
+            and other_node.metadata.get('letsencrypt/delegate_to_node', None) == node.name
-            for domain in other_node.metadata.get('letsencrypt/domains').keys()
+            for domain, conf in other_node.metadata.get('letsencrypt/domains').items()
     }
 
     return {
         'letsencrypt': {
-            'domains': {
+            'domains': delegated_domains,
-                domain: set()
-                    for domain in delegated_domains
-            },
         },
         'dns': {
             domain: repo.libs.dns.get_a_records(metadata, internal=False)
-                for domain in delegated_domains
+                for domain in delegated_domains.keys()
         },
     }

bundles/mailserver/metadata.py

@@ -60,7 +60,9 @@ def letsencrypt(metadata):
     return {
         'letsencrypt': {
             'domains': {
-                metadata.get('mailserver/hostname'): set(),
+                metadata.get('mailserver/hostname'): {
+                    'reload': {'dovecot', 'postfix'},
+                },
             },
         },
     } 

bundles/mosquitto/metadata.py

@@ -84,7 +84,7 @@ def letsencrypt(metadata):
     return  {
         'letsencrypt': {
             'domains': {
-                metadata.get('mosquitto/hostname'): set(),
+                metadata.get('mosquitto/hostname'): {},
             },
         },
     }

bundles/nginx/metadata.py

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

nodes/htz.mails.py

@@ -63,9 +63,15 @@
         },
         'letsencrypt': {
             'domains': {
-                'ckn.li': set(),
+                'ckn.li': {},
-                'sublimity.de': set(),
+                'test6.ckn.li': {
-                'freibrief.net': set(),
+                    'aliases': {'www.test6.ckn.li'},
+                    'location': '/root/temp',
+                    'owner': 'telegraf',
+                    'reload': {'telegraf'},
+                },
+                'sublimity.de': {},
+                'freibrief.net': {},
             },
         },
         'mailserver': {