From cd41ed503bf3380462df6549912c2a0b7a1b57b7 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sun, 13 Jun 2021 19:09:50 +0200
Subject: [PATCH] wip

---
 bundles/dovecot/items.py       |  5 ++---
 bundles/mailserver/items.py    |  3 +++
 bundles/mailserver/metadata.py | 12 ++++++++++++
 bundles/postfix/items.py       |  4 +---
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 bundles/mailserver/items.py

diff --git a/bundles/dovecot/items.py b/bundles/dovecot/items.py
index 81caaf3..2bb30c8 100644
--- a/bundles/dovecot/items.py
+++ b/bundles/dovecot/items.py
@@ -1,6 +1,4 @@
-assert node.has_bundle('postfix')
-assert node.has_bundle('postgresql')
-assert node.has_bundle('letsencrypt')
+assert node.has_bundle('mailserver')
 
 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',
diff --git a/bundles/mailserver/items.py b/bundles/mailserver/items.py
new file mode 100644
index 0000000..7592696
--- /dev/null
+++ b/bundles/mailserver/items.py
@@ -0,0 +1,3 @@
+assert node.has_bundle('postfix')
+assert node.has_bundle('dovecot')
+assert node.has_bundle('letsencrypt')
diff --git a/bundles/mailserver/metadata.py b/bundles/mailserver/metadata.py
index 41049ba..cf23fab 100644
--- a/bundles/mailserver/metadata.py
+++ b/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(),
+            },
+        },
+    } 
diff --git a/bundles/postfix/items.py b/bundles/postfix/items.py
index cba5faa..4aef34e 100644
--- a/bundles/postfix/items.py
+++ b/bundles/postfix/items.py
@@ -1,6 +1,4 @@
-assert node.has_bundle('postgresql')
-assert node.has_bundle('dovecot')
-assert node.has_bundle('letsencrypt')
+assert node.has_bundle('mailserver')
 
 file_options = {
     'triggers': [