From 878a08c951693a79d9f11191817275e0dea1538a Mon Sep 17 00:00:00 2001
From: appeasementPolitik
 <108810900+appeasementPolitik@users.noreply.github.com>
Date: Thu, 21 Jul 2022 19:28:25 +0200
Subject: [PATCH 1/4] Improve deploy hook

---
 emailwiz.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emailwiz.sh b/emailwiz.sh
index f7028df..08685ac 100755
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -320,9 +320,9 @@ spfentry="$domain	TXT	v=spf1 mx a:$maildomain -all"
 
 useradd -m -G mail dmarc
 
-grep -q "^deploy-hook = postfix reload" /etc/letsencrypt/cli.ini ||
+grep -q '^deploy-hook = echo "$RENEWED_DOMAINS" | grep -q' /etc/letsencrypt/cli.ini ||
 	echo "
-deploy-hook = service postfix reload && service dovecot reload" >> /etc/letsencrypt/cli.ini
+deploy-hook = echo "$RENEWED_DOMAINS" | grep -q "$maildomain" && service postfix reload && service dovecot reload" >> /etc/letsencrypt/cli.ini
 
 echo "$dkimentry
 $dmarcentry

From 1be3a8bfaad737334ebb590547064f6f95c20b4b Mon Sep 17 00:00:00 2001
From: appeasementPolitik
 <108810900+appeasementPolitik@users.noreply.github.com>
Date: Thu, 21 Jul 2022 19:34:46 +0200
Subject: [PATCH 2/4] Escapes

---
 emailwiz.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emailwiz.sh b/emailwiz.sh
index 08685ac..757201b 100755
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -322,7 +322,7 @@ useradd -m -G mail dmarc
 
 grep -q '^deploy-hook = echo "$RENEWED_DOMAINS" | grep -q' /etc/letsencrypt/cli.ini ||
 	echo "
-deploy-hook = echo "$RENEWED_DOMAINS" | grep -q "$maildomain" && service postfix reload && service dovecot reload" >> /etc/letsencrypt/cli.ini
+deploy-hook = echo "\$RENEWED_DOMAINS" | grep -q \"$maildomain\" && service postfix reload && service dovecot reload" >> /etc/letsencrypt/cli.ini
 
 echo "$dkimentry
 $dmarcentry

From 69a72a7bbab59c828e0fbc3b69ea0790b988943f Mon Sep 17 00:00:00 2001
From: appeasementPolitik
 <108810900+appeasementPolitik@users.noreply.github.com>
Date: Thu, 21 Jul 2022 19:37:10 +0200
Subject: [PATCH 3/4] Missing double quote

---
 emailwiz.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emailwiz.sh b/emailwiz.sh
index 757201b..5238ba1 100755
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -322,7 +322,7 @@ useradd -m -G mail dmarc
 
 grep -q '^deploy-hook = echo "$RENEWED_DOMAINS" | grep -q' /etc/letsencrypt/cli.ini ||
 	echo "
-deploy-hook = echo "\$RENEWED_DOMAINS" | grep -q \"$maildomain\" && service postfix reload && service dovecot reload" >> /etc/letsencrypt/cli.ini
+deploy-hook = echo "\$RENEWED_DOMAINS" | grep -q \"$maildomain\"" && service postfix reload && service dovecot reload" >> /etc/letsencrypt/cli.ini
 
 echo "$dkimentry
 $dmarcentry

From 5acfa3fd63e75e9bbb474ca394f2b4416ea910da Mon Sep 17 00:00:00 2001
From: appeasementPolitik
 <108810900+appeasementPolitik@users.noreply.github.com>
Date: Thu, 21 Jul 2022 19:42:26 +0200
Subject: [PATCH 4/4] Done

---
 emailwiz.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emailwiz.sh b/emailwiz.sh
index 5238ba1..74b2332 100755
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -322,7 +322,7 @@ useradd -m -G mail dmarc
 
 grep -q '^deploy-hook = echo "$RENEWED_DOMAINS" | grep -q' /etc/letsencrypt/cli.ini ||
 	echo "
-deploy-hook = echo "\$RENEWED_DOMAINS" | grep -q \"$maildomain\"" && service postfix reload && service dovecot reload" >> /etc/letsencrypt/cli.ini
+deploy-hook = echo \"\$RENEWED_DOMAINS\" | grep -q '$maildomain' && service postfix reload && service dovecot reload" >> /etc/letsencrypt/cli.ini
 
 echo "$dkimentry
 $dmarcentry