From ad5c8cc0ab63851287fbe5d0f523563577892ca8 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sat, 20 Feb 2021 17:30:38 +0100
Subject: [PATCH] bundles/postfix: only get certificate if actually needed

---
 bundles/letsencrypt/files/domains.txt |  2 --
 bundles/postfix/metadata.py           | 11 ++++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/bundles/letsencrypt/files/domains.txt b/bundles/letsencrypt/files/domains.txt
index d9d7824..ea7e427 100644
--- a/bundles/letsencrypt/files/domains.txt
+++ b/bundles/letsencrypt/files/domains.txt
@@ -1,5 +1,3 @@
-${node.metadata['hostname']}
-
 % for domain, aliases in sorted(node.metadata.get('letsencrypt/domains', {}).items()):
 ${domain} ${' '.join(sorted(aliases))}
 % endfor
diff --git a/bundles/postfix/metadata.py b/bundles/postfix/metadata.py
index 4399e3b..9899988 100644
--- a/bundles/postfix/metadata.py
+++ b/bundles/postfix/metadata.py
@@ -49,7 +49,7 @@ else:
     'letsencrypt/reload_after',
 )
 def letsencrypt(metadata):
-    if not node.has_bundle('letsencrypt'):
+    if not node.has_bundle('letsencrypt') or not node.has_bundle('postfixadmin'):
         raise DoNotRunAgain
 
     result = {
@@ -58,12 +58,9 @@ def letsencrypt(metadata):
         },
     }
 
-    myhostname = metadata.get('postfix/myhostname', None)
-
-    if myhostname and myhostname != metadata.get('hostname'):
-        result['domains'] = {
-            myhostname: set(),
-        }
+    result['domains'] = {
+        metadata.get('postfix/myhostname', metadata.get('hostname')): set(),
+    }
 
     return {
         'letsencrypt': result,