From b7ff8b2e7a9c200a71b92b61727b313a5592ff24 Mon Sep 17 00:00:00 2001
From: Brennan Kinney <5098581+polarathene@users.noreply.github.com>
Date: Fri, 17 May 2024 21:21:46 +1200
Subject: [PATCH] fix: Drop `/var/lib/getmail/` location

---
 target/bin/debug-getmail                     | 8 +-------
 target/bin/getmail-cron                      | 3 ++-
 target/scripts/startup/setup.d/getmail.sh    | 5 +++--
 target/scripts/startup/setup.d/mail_state.sh | 1 -
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/target/bin/debug-getmail b/target/bin/debug-getmail
index 27834475..60270215 100644
--- a/target/bin/debug-getmail
+++ b/target/bin/debug-getmail
@@ -7,13 +7,7 @@ source /usr/local/bin/setup.d/getmail.sh
 
 _setup_getmail
 
-if [[ -d /var/lib/getmail ]]; then
-  GETMAILDIR=/var/lib/getmail
-else
-  mkdir -p /tmp/docker-mailserver/getmail
-  GETMAILDIR=/tmp/docker-mailserver/getmail
-fi
-
+GETMAILDIR=/tmp/docker-mailserver/getmail
 for FILE in /etc/getmailrc.d/getmailrc*; do
   getmail --getmaildir "${GETMAILDIR}" --rcfile "${FILE}" --dump | tail -n +6
 done
diff --git a/target/bin/getmail-cron b/target/bin/getmail-cron
index 8e1e4749..fec03906 100644
--- a/target/bin/getmail-cron
+++ b/target/bin/getmail-cron
@@ -1,7 +1,8 @@
 #! /bin/bash
 
+GETMAILDIR=/tmp/docker-mailserver/getmail
 for FILE in /etc/getmailrc.d/getmailrc*; do
   if ! pgrep -f "${FILE}$" &>/dev/null; then
-    getmail --getmaildir /var/lib/getmail --rcfile "${FILE}"
+    getmail --getmaildir "${GETMAILDIR}" --rcfile "${FILE}"
   fi
 done
diff --git a/target/scripts/startup/setup.d/getmail.sh b/target/scripts/startup/setup.d/getmail.sh
index c6cda386..c1345063 100644
--- a/target/scripts/startup/setup.d/getmail.sh
+++ b/target/scripts/startup/setup.d/getmail.sh
@@ -33,8 +33,9 @@ EOF
     fi
 
     # Both the debug command and cron job (that runs getmail) for getmail
-    # expect this location to exist. As does the `/var/mail-state` startup script.
-    mkdir -p /var/lib/getmail
+    # expect this location to exist.
+    GETMAILDIR=/tmp/docker-mailserver/getmail
+    mkdir -p "${GETMAILDIR}"
   else
     _log 'debug' 'Getmail is disabled'
   fi
diff --git a/target/scripts/startup/setup.d/mail_state.sh b/target/scripts/startup/setup.d/mail_state.sh
index e819c138..de15ee3b 100644
--- a/target/scripts/startup/setup.d/mail_state.sh
+++ b/target/scripts/startup/setup.d/mail_state.sh
@@ -23,7 +23,6 @@ function _setup_save_states() {
     [[ ${ENABLE_CLAMAV}       -eq 1 ]] && SERVICEDIRS+=('lib/clamav')
     [[ ${ENABLE_FAIL2BAN}     -eq 1 ]] && SERVICEDIRS+=('lib/fail2ban')
     [[ ${ENABLE_FETCHMAIL}    -eq 1 ]] && SERVICEDIRS+=('lib/fetchmail')
-    [[ ${ENABLE_GETMAIL}      -eq 1 ]] && SERVICEDIRS+=('lib/getmail')
     [[ ${ENABLE_MTA_STS}      -eq 1 ]] && SERVICEDIRS+=('lib/mta-sts')
     [[ ${ENABLE_POSTGREY}     -eq 1 ]] && SERVICEDIRS+=('lib/postgrey')
     [[ ${ENABLE_RSPAMD}       -eq 1 ]] && SERVICEDIRS+=('lib/rspamd')