From 0b705af7c74ce89c6acfdfc09ae6974402599484 Mon Sep 17 00:00:00 2001
From: Myve <forge@myvelabs.com>
Date: Sun, 18 Aug 2024 02:50:00 +0000
Subject: [PATCH] 	modified:   build/Dockerfile.ubuntu 	modified:  
 build/run/docker-entrypoint/init.d/50-cron.sh 	modified:  
 build/run/installer.sh

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

diff --git a/build/Dockerfile.ubuntu b/build/Dockerfile.ubuntu
index 4ab6565..cee3b33 100644
--- a/build/Dockerfile.ubuntu
+++ b/build/Dockerfile.ubuntu
@@ -27,7 +27,6 @@ RUN apt remove -y nano* exim*; \
     && apt install -y \
         ca-certificates \
         git wget bind9-host acl dbconfig-no-thanks at \
-        rsyslog \
         nginx \
         mariadb-server mariadb-client postfix-mysql dovecot-mysql \
         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 \
diff --git a/build/run/docker-entrypoint/init.d/50-cron.sh b/build/run/docker-entrypoint/init.d/50-cron.sh
index 6dcbb07..2ba8361 100755
--- a/build/run/docker-entrypoint/init.d/50-cron.sh
+++ b/build/run/docker-entrypoint/init.d/50-cron.sh
@@ -13,7 +13,10 @@ done &
 # Update Postscreen Whitelists (daily)
 while true
 do
-    at -f /usr/local/bin/postwhite/postwhite midnight
+    at midnight <<- postwhite
+	wget -q https://myvelabs.com/docker/myvemail-docker/raw/branch/master/data/postwhite -O /etc/postfix/postscreen_spf_whitelist.cidr
+	postfix reload
+	postwhite
     sleep 1d
 done &
 
diff --git a/build/run/installer.sh b/build/run/installer.sh
index 96e899f..17c4ac0 100755
--- a/build/run/installer.sh
+++ b/build/run/installer.sh
@@ -479,8 +479,4 @@ nginx
 cd /usr/local/bin
 git clone --quiet https://github.com/spf-tools/spf-tools.git
 git clone --quiet https://github.com/stevejenkins/postwhite.git
-
-sed "/reload_postfix/c reload_postfix=no/" /usr/local/bin/postwhite/postwhite.conf >/etc/postwhite.conf
-bash /usr/local/bin/postwhite/postwhite
-
 cp /usr/local/bin/postwhite/postwhite.conf /etc