From 2d34ea978182b39b8afb7cad5a7f378caf57d472 Mon Sep 17 00:00:00 2001
From: jvolkenant <jeff@volkenant.net>
Date: Mon, 19 Sep 2022 13:09:22 -0700
Subject: [PATCH] Create db dir and copy files instead of nested folder

---
 setup/mail-postfix.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup/mail-postfix.sh b/setup/mail-postfix.sh
index 3537837b..9a3b620f 100755
--- a/setup/mail-postfix.sh
+++ b/setup/mail-postfix.sh
@@ -250,10 +250,10 @@ tools/editconf.py /etc/default/postgrey \
 if [ ! -d $STORAGE_ROOT/mail/postgrey/db ]; then
 	# Stop the service
 	service postgrey stop
-	# Ensure the new base path for postgrey exists
-	mkdir -p $STORAGE_ROOT/mail/postgrey
-	# Move over database
-	mv /var/lib/postgrey $STORAGE_ROOT/mail/postgrey/db
+	# Ensure the new paths for postgrey db exists
+	mkdir -p $STORAGE_ROOT/mail/postgrey $STORAGE_ROOT/mail/postgrey/db
+	# Move over database files
+	mv /var/lib/postgrey/* $STORAGE_ROOT/mail/postgrey/db/ || true
 fi
 # Ensure permissions are set
 chown -R postgrey:postgrey $STORAGE_ROOT/mail/postgrey/