From ae0c69f3b9e9a0d6e3cc151f5459b9223698e8aa Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Wed, 21 Sep 2022 09:06:52 -0400
Subject: [PATCH] disable postgrey when using encryption-at-rest. the postgrey
 database will be moving to user-data

---
 ehdd/postinstall.sh           | 1 +
 ehdd/run-this-after-reboot.sh | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ehdd/postinstall.sh b/ehdd/postinstall.sh
index 0bae580b..f5a829a3 100755
--- a/ehdd/postinstall.sh
+++ b/ehdd/postinstall.sh
@@ -18,6 +18,7 @@ if [ -e "$EHDD_IMG" ]; then
         echo "** Disabling system services **"
         systemctl disable --quiet postfix
         systemctl disable --quiet dovecot
+        systemctl disable --quiet postgrey
         systemctl disable --quiet cron
         systemctl disable --quiet nginx
         systemctl disable --quiet php8.0-fpm
diff --git a/ehdd/run-this-after-reboot.sh b/ehdd/run-this-after-reboot.sh
index bccfa4b4..1ce801a8 100755
--- a/ehdd/run-this-after-reboot.sh
+++ b/ehdd/run-this-after-reboot.sh
@@ -15,6 +15,8 @@ if [ -s /etc/mailinabox.conf ]; then
     systemctl start php8.0-fpm
     systemctl start dovecot
     systemctl start postfix
+    # postgrey's main database and local client whitelist are in user-data
+    systemctl restart postgrey
     systemctl start nginx
     systemctl start cron
     #systemctl start nsd
@@ -22,10 +24,5 @@ if [ -s /etc/mailinabox.conf ]; then
     systemctl start fail2ban
     systemctl restart mailinabox
     systemctl start miabldap-capture
-    # since postgrey's local client whitelist is in user-data, reload
-    # to ensure postgrey daemon has it.
-    #
-    # TODO: this should be 'reload' but is broken in jammy (reload fails on a systemctl permissions issue accessing postgrey's pid file)
-    systemctl restart postgrey
 fi