From afb613e32d96825acbc27730e2da469a77416b73 Mon Sep 17 00:00:00 2001
From: Myve <forge@myvelabs.com>
Date: Wed, 14 Aug 2024 17:48:59 +0000
Subject: [PATCH] Fixed perl policy and at syntax

---
 build/Dockerfile.alpine                       | 1 +
 build/Dockerfile.ubuntu                       | 3 ++-
 build/run/docker-entrypoint/init.d/50-cron.sh | 6 +++---
 build/run/installer.sh                        | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/Dockerfile.alpine b/build/Dockerfile.alpine
index 57caa70..e1d817b 100644
--- a/build/Dockerfile.alpine
+++ b/build/Dockerfile.alpine
@@ -8,6 +8,7 @@ LABEL description="MyveMail"
 ENV MYVEMAIL_NGINX_USERGROUP=nginx
 ENV MYVEMAIL_OPENDKIM_CONF=/etc/opendkim/opendkim.conf
 ENV MYVEMAIL_OPENDMARC_CONF=/etc/opendmarc/opendmarc.conf
+ENV MYVEMAIL_POLICYD=/usr/bin/postfix-policyd-spf-perl
 
 # Copy required files folders
 ADD run/bin /usr/local/bin/
diff --git a/build/Dockerfile.ubuntu b/build/Dockerfile.ubuntu
index 3867f76..4ab6565 100644
--- a/build/Dockerfile.ubuntu
+++ b/build/Dockerfile.ubuntu
@@ -11,6 +11,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV MYVEMAIL_NGINX_USERGROUP=www-data
 ENV MYVEMAIL_OPENDKIM_CONF=/etc/opendkim.conf
 ENV MYVEMAIL_OPENDMARC_CONF=/etc/opendmarc.conf
+ENV MYVEMAIL_POLICYD=/usr/sbin/postfix-policyd-spf-perl
 
 # Copy required files folders
 ADD run/bin /usr/local/bin/
@@ -32,7 +33,7 @@ RUN apt remove -y nano* exim*; \
         php php-fpm php-imap php-mbstring php-mysql php-json php-curl php-zip php-xml php-bz2 php-intl php-gmp php-net-ldap3 php-imagick php-common php-gd php-sqlite3 php-cli \
         postfix postfix-pcre \
         dovecot-core dovecot-imapd dovecot-lmtpd \
-        postfix-policyd-spf-python opendkim opendkim-tools \
+        postfix-policyd-spf-perl opendkim opendkim-tools \
         opendmarc \
     && apt autoremove -y \
     && apt clean \
diff --git a/build/run/docker-entrypoint/init.d/50-cron.sh b/build/run/docker-entrypoint/init.d/50-cron.sh
index ac2af1f..50ea527 100755
--- a/build/run/docker-entrypoint/init.d/50-cron.sh
+++ b/build/run/docker-entrypoint/init.d/50-cron.sh
@@ -6,19 +6,19 @@ atd
 # Roundcube cleanup (daily)
 while true
 do
-    at midnight -f /usr/share/webapps/roundcube/bin/cleandb.sh
+    at -f /usr/share/webapps/roundcube/bin/cleandb.sh midnight
 done &
 
 # Update Postscreen Whitelists (daily)
 while true
 do
-    at midnight -f /usr/local/bin/postwhite/postwhite
+    at -f /usr/local/bin/postwhite/postwhite midnight
 done &
 
 # Update Yahoo! IPs for Postscreen Whitelists (weekly)
 while true
 do
-    at midnight sunday -f /usr/local/bin/postwhite/scrape_yahoo
+    at -f /usr/local/bin/postwhite/scrape_yahoo midnight sunday
 done &
 
 # # Refresh ssl keys daily
diff --git a/build/run/installer.sh b/build/run/installer.sh
index 2c48a4c..17c4ac0 100755
--- a/build/run/installer.sh
+++ b/build/run/installer.sh
@@ -121,7 +121,7 @@ postconf -e "body_checks = pcre:/etc/postfix/body_checks"
 # master.cf
 sed -e 's/^smtp .*smtpd$/# &/' \
     -e '/#smtp\|#smtpd\|#dnsblog\|#tlsproxy/ s/^#//' -i /etc/postfix/master.cf
-tee -a /etc/postfix/master.cf >/dev/null <<- 'master.cf'
+tee -a /etc/postfix/master.cf >/dev/null <<- master.cf
 
 # Enable submission
 submission inet n       -       y       -       -       smtpd
@@ -136,7 +136,7 @@ submission inet n       -       y       -       -       smtpd
 
 # SPF Policy
 policy       unix  -       n       n       -       0       spawn
-    user=nobody argv=/usr/bin/postfix-policyd-spf-perl
+    user=nobody argv=${MYVEMAIL_POLICYD}
 master.cf
 
 # Deleting Email Headers For Outgoing Emails