wip

bundles/dovecot/items.py

@@ -1,6 +1,4 @@
-assert node.has_bundle('postfix')
+assert node.has_bundle('mailserver')
-assert node.has_bundle('postgresql')
-assert node.has_bundle('letsencrypt')
 
 directories = {
     '/etc/dovecot/ssl': {},
@@ -48,6 +46,7 @@ actions = {
 svc_systemd = {
     'dovecot': {
         'needs': {
+            'action:letsencrypt_update_certificates',
             'action:dovecot_generate_dhparam',
             'file:/etc/dovecot/dovecot.conf',
             'file:/etc/dovecot/dovecot-sql.conf',

bundles/mailserver/items.py

@@ -0,0 +1,3 @@
+assert node.has_bundle('postfix')
+assert node.has_bundle('dovecot')
+assert node.has_bundle('letsencrypt')

bundles/mailserver/metadata.py

@@ -31,3 +31,15 @@ defaults = {
         },
     },
 }
+
+@metadata_reactor.provides(
+    'letsencrypt/domains',
+)
+def letsencrypt(metadata):
+    return {
+        'letsencrypt': {
+            'domains': {
+                metadata.get('mailserver/hostname'): set(),
+            },
+        },
+    } 

bundles/postfix/items.py

@@ -1,6 +1,4 @@
-assert node.has_bundle('postgresql')
+assert node.has_bundle('mailserver')
-assert node.has_bundle('dovecot')
-assert node.has_bundle('letsencrypt')
 
 file_options = {
     'triggers': [