Skip to content

BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr

postfix, dovecot, rspamd logs support compressed backups and delete old backup logs regularly

aapanel.com47e23108bcfb
diff --git a/Dockerfiles/core/core.sh b/Dockerfiles/core/core.sh
index db64aabe..93569c91 100644
--- a/Dockerfiles/core/core.sh
+++ b/Dockerfiles/core/core.sh
@@ -39,7 +39,9 @@ if [[ ${FAIL2BAN_INIT} == "y" ]]; then
if ! grep -q "restart_fail2ban.sh" /var/spool/cron/crontabs/root; then
chmod +x /restart_fail2ban.sh
- echo "02 0,12 * * * bash /restart_fail2ban.sh" >> /var/spool/cron/crontabs/root
+ echo "02 0,12 * * * bash /restart_fail2ban.sh" >> /var/spool/cron/crontabs/root
+ chmod 600 /var/spool/cron/crontabs/root
+ chown root:crontab /var/spool/cron/crontabs/root
pkill -9 crond
fi
bash /restart_fail2ban.sh
diff --git a/Dockerfiles/core/supervisord.conf b/Dockerfiles/core/supervisord.conf
index 343cb921..3347effb 100644
--- a/Dockerfiles/core/supervisord.conf
+++ b/Dockerfiles/core/supervisord.conf
@@ -43,4 +43,14 @@ user=root
[eventlistener:processes]
command=/stop-supervisor.sh
-events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL
\ No newline at end of file
+events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisord.sock
+
+[unix_http_server]
+file=/var/run/supervisord.sock
+chmod=0700
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
\ No newline at end of file
diff --git a/Dockerfiles/dovecot/Dockerfile b/Dockerfiles/dovecot/Dockerfile
index 949cbd18..9ce1fa1e 100644
--- a/Dockerfiles/dovecot/Dockerfile
+++ b/Dockerfiles/dovecot/Dockerfile
@@ -8,6 +8,7 @@ ENV LC_ALL=C
## Copy file
COPY stop-supervisor.sh /stop-supervisor.sh
COPY dovecot.sh /dovecot.sh
+COPY rotate_log.sh /rotate_log.sh
# COPY debian.sources /etc/apt/sources.list.d/debian.sources
@@ -31,9 +32,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends --allow-downgra
rsyslog \
tzdata \
telnet \
+ cron \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
&& mkdir -p /usr/lib/dovecot/sieve \
- && chmod +x /stop-supervisor.sh /dovecot.sh
+ && chmod +x /stop-supervisor.sh /dovecot.sh /rotate_log.sh
## Copy the supervisord configuration file
diff --git a/Dockerfiles/dovecot/dovecot.sh b/Dockerfiles/dovecot/dovecot.sh
index 68afeb38..cd193379 100644
--- a/Dockerfiles/dovecot/dovecot.sh
+++ b/Dockerfiles/dovecot/dovecot.sh
@@ -8,6 +8,14 @@ if [ ! -f "/etc/ssl/mail/dh.pem" ] || [ ! -f "/etc/ssl/mail/cert.pem" ] || [ ! -
cp -d -n /etc/ssl/ssl-self-signed/* /etc/ssl/mail/
fi
+if ! grep -q "rotate_log.sh" /var/spool/cron/crontabs/root; then
+ chmod +x /rotate_log.sh
+ echo "05 00 * * * bash /rotate_log.sh >> /var/log/mail/rotate_log.log 2>&1" >> /var/spool/cron/crontabs/root
+ chmod 600 /var/spool/cron/crontabs/root
+ chown root:crontab /var/spool/cron/crontabs/root
+ /usr/bin/supervisorctl restart cron
+fi
+
cat <<EOF > /etc/dovecot/conf.d/dovecot-sql.conf.ext
driver = pgsql
connect = host=pgsql dbname=${DBNAME} user=${DBUSER} password=${DBPASS}
diff --git a/Dockerfiles/dovecot/rotate_log.sh b/Dockerfiles/dovecot/rotate_log.sh
new file mode 100644
index 00000000..fe4ce0fa
--- /dev/null
+++ b/Dockerfiles/dovecot/rotate_log.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+echo " ---- $(date) START ----"
+
+LOG_DIR="/var/log/mail"
+LOG_FILE="${LOG_DIR}/mail.log"
+DATE=$(date +%Y%m%d)
+BACKUP_FILE="${LOG_DIR}/mail-${DATE}.log"
+
+# Retention days
+RETENTION_DAYS=${RETENTION_DAYS:-7}
+# echo "Retention days: ${RETENTION_DAYS}"
+
+# backup log
+if [ -f "${LOG_FILE}" ]; then
+ echo "Backup log: ${LOG_FILE}"
+ mv "${LOG_FILE}" "${BACKUP_FILE}"
+
+ # Restart rsyslog
+ if [ -f "/var/run/rsyslogd.pid" ]; then
+ kill -HUP $(cat /var/run/rsyslogd.pid) >/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ echo "Restart rsyslogd"
+ /usr/bin/supervisorctl restart rsyslog
+ fi
+ else
+ /usr/bin/supervisorctl restart rsyslog
+ fi
+
+else
+ echo "The log file does not exist: ${LOG_FILE}"
+ echo ""
+ exit 1
+fi
+
+
+# sleep 2
+# CHECK_RSYSLOG=$(/usr/bin/supervisorctl status rsyslog|grep RUNNING)
+# if [ -z "${CHECK_RSYSLOG}" ]; then
+# echo "rsyslog is not running, Starting..."
+# /usr/bin/supervisorctl restart rsyslog
+# fi
+
+# CHECK_dovecot=$(/usr/bin/supervisorctl status dovecot|grep RUNNING)
+# if [ -z "${CHECK_dovecot}" ]; then
+# echo "dovecot is not running, Starting..."
+# /usr/bin/supervisorctl restart dovecot
+# fi
+
+# Compress backup files
+if [ -f "${BACKUP_FILE}.gz" ]; then
+ mv "${BACKUP_FILE}.gz" "${BACKUP_FILE}_1.gz"
+fi
+echo "Compressing: "${BACKUP_FILE}""
+gzip "${BACKUP_FILE}"
+
+# Clean up expiration logs
+echo "Cleaning up expiration logs:"
+find "${LOG_DIR}" -name "mail-*.log.gz" -type f -mtime +${RETENTION_DAYS} -print -delete
+
+echo " ---- $(date) END ----"
+echo ""
+
+# 10MB in bytes
+SIZE_THRESHOLD=$((10 * 1024 * 1024))
+TARGET_LOG="${LOG_DIR}/rotate_log.log"
+GZIP_LOG="${LOG_DIR}/rotate_log-${DATE}.log"
+# Check whether the target log file exceeds 10 m, if so, compress
+if [ -f "${TARGET_LOG}" ]; then
+ FILE_SIZE=$(stat -c %s "${TARGET_LOG}")
+
+ if [ ${FILE_SIZE} -gt ${SIZE_THRESHOLD} ]; then
+ echo "Log file ${TARGET_LOG} exceeds 10M, compress..."
+ mv "${TARGET_LOG}" "${GZIP_LOG}"
+ gzip "${GZIP_LOG}"
+ fi
+fi
+find "${LOG_DIR}" -name "rotate_log-*.gz" -type f -mtime +${RETENTION_DAYS} -delete
diff --git a/Dockerfiles/dovecot/supervisord.conf b/Dockerfiles/dovecot/supervisord.conf
index ce26e78a..0a44925d 100644
--- a/Dockerfiles/dovecot/supervisord.conf
+++ b/Dockerfiles/dovecot/supervisord.conf
@@ -26,6 +26,27 @@ startsecs=10
stopasgroup=true
killasgroup=true
+[program:cron]
+command=/usr/sbin/cron -f
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+user=root
+
+
[eventlistener:processes]
command=/stop-supervisor.sh
-events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL
\ No newline at end of file
+events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock
+
+[unix_http_server]
+file=/var/run/supervisor.sock
+chmod=0700
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
\ No newline at end of file
diff --git a/Dockerfiles/postfix/Dockerfile b/Dockerfiles/postfix/Dockerfile
index 94f025d2..acc73ea4 100644
--- a/Dockerfiles/postfix/Dockerfile
+++ b/Dockerfiles/postfix/Dockerfile
@@ -13,6 +13,7 @@ RUN dpkg-divert --local --rename --add /sbin/initctl \
## Copy postfix file
COPY postfix.sh /postfix.sh
COPY stop-supervisor.sh /stop-supervisor.sh
+COPY rotate_log.sh /rotate_log.sh
# COPY debian.sources /etc/apt/sources.list.d/debian.sources
@@ -38,8 +39,9 @@ RUN groupadd -g 102 postfix \
telnet \
net-tools \
tzdata \
+ cron \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
- && chmod +x /postfix.sh /stop-supervisor.sh
+ && chmod +x /postfix.sh /stop-supervisor.sh /rotate_log.sh
## Copy the supervisord configuration file
diff --git a/Dockerfiles/postfix/postfix.sh b/Dockerfiles/postfix/postfix.sh
index 3ce455e3..acecb6d8 100644
--- a/Dockerfiles/postfix/postfix.sh
+++ b/Dockerfiles/postfix/postfix.sh
@@ -2,6 +2,13 @@
trap "postfix stop" EXIT
+if ! grep -q "rotate_log.sh" /var/spool/cron/crontabs/root; then
+ chmod +x /rotate_log.sh
+ echo "00 00 * * * bash /rotate_log.sh >> /var/log/mail/rotate_log.log 2>&1" >> /var/spool/cron/crontabs/root
+ chmod 600 /var/spool/cron/crontabs/root
+ chown root:crontab /var/spool/cron/crontabs/root
+ /usr/bin/supervisorctl restart cron
+fi
cat <<EOF > /etc/postfix/btrule.cf
diff --git a/Dockerfiles/postfix/rotate_log.sh b/Dockerfiles/postfix/rotate_log.sh
new file mode 100644
index 00000000..f82f71f8
--- /dev/null
+++ b/Dockerfiles/postfix/rotate_log.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+echo " ---- $(date) START ----"
+
+LOG_DIR="/var/log/mail"
+LOG_FILE="${LOG_DIR}/mail.log"
+DATE=$(date +%Y%m%d)
+BACKUP_FILE="${LOG_DIR}/mail-${DATE}.log"
+
+# Retention days
+RETENTION_DAYS=${RETENTION_DAYS:-7}
+# echo "Retention days: ${RETENTION_DAYS}"
+
+# backup log
+if [ -f "${LOG_FILE}" ]; then
+ echo "Backup log: ${LOG_FILE}"
+ mv "${LOG_FILE}" "${BACKUP_FILE}"
+
+ # Restart rsyslog
+ if [ -f "/var/run/rsyslogd.pid" ]; then
+ kill -HUP $(cat /var/run/rsyslogd.pid) >/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ echo "Restart rsyslogd"
+ /usr/bin/supervisorctl restart rsyslog
+ fi
+ else
+ /usr/bin/supervisorctl restart rsyslog
+ fi
+
+else
+ echo "The log file does not exist: ${LOG_FILE}"
+ echo ""
+ exit 1
+fi
+
+
+# sleep 2
+# CHECK_RSYSLOG=$(/usr/bin/supervisorctl status rsyslog|grep RUNNING)
+# if [ -z "${CHECK_RSYSLOG}" ]; then
+# echo "rsyslog is not running, Starting..."
+# /usr/bin/supervisorctl restart rsyslog
+# fi
+
+# CHECK_POSTFIX=$(/usr/bin/supervisorctl status postfix|grep RUNNING)
+# if [ -z "${CHECK_POSTFIX}" ]; then
+# echo "Postfix is not running, Starting..."
+# /usr/bin/supervisorctl restart postfix
+# fi
+
+# Compress backup files
+if [ -f "${BACKUP_FILE}.gz" ]; then
+ mv "${BACKUP_FILE}.gz" "${BACKUP_FILE}_1.gz"
+fi
+echo "Compressing: "${BACKUP_FILE}""
+gzip "${BACKUP_FILE}"
+
+# Clean up expiration logs
+echo "Cleaning up expiration logs:"
+find "${LOG_DIR}" -name "mail-*.log.gz" -type f -mtime +${RETENTION_DAYS} -print -delete
+
+echo " ---- $(date) END ----"
+echo ""
+
+# 10MB in bytes
+SIZE_THRESHOLD=$((10 * 1024 * 1024))
+TARGET_LOG="${LOG_DIR}/rotate_log.log"
+GZIP_LOG="${LOG_DIR}/rotate_log-${DATE}.log"
+# Check whether the target log file exceeds 10 m, if so, compress
+if [ -f "${TARGET_LOG}" ]; then
+ FILE_SIZE=$(stat -c %s "${TARGET_LOG}")
+
+ if [ ${FILE_SIZE} -gt ${SIZE_THRESHOLD} ]; then
+ echo "Log file ${TARGET_LOG} exceeds 10M, compress..."
+ mv "${TARGET_LOG}" "${GZIP_LOG}"
+ gzip "${GZIP_LOG}"
+ fi
+fi
+find "${LOG_DIR}" -name "rotate_log-*.gz" -type f -mtime +${RETENTION_DAYS} -delete
diff --git a/Dockerfiles/postfix/supervisord.conf b/Dockerfiles/postfix/supervisord.conf
index 1aa898e9..71d1df64 100644
--- a/Dockerfiles/postfix/supervisord.conf
+++ b/Dockerfiles/postfix/supervisord.conf
@@ -24,6 +24,27 @@ stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
startsecs=10
+[program:cron]
+command=/usr/sbin/cron -f
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+user=root
+
+
[eventlistener:processes]
command=/stop-supervisor.sh
-events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL
\ No newline at end of file
+events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock
+
+[unix_http_server]
+file=/var/run/supervisor.sock
+chmod=0700
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
diff --git a/Dockerfiles/rspamd/Dockerfile b/Dockerfiles/rspamd/Dockerfile
index c7b27419..c6e4395b 100644
--- a/Dockerfiles/rspamd/Dockerfile
+++ b/Dockerfiles/rspamd/Dockerfile
@@ -8,6 +8,8 @@ ARG CODENAME=bookworm
ENV LC_ALL=C
COPY rspamd.sh /rspamd.sh
+COPY stop-supervisor.sh /stop-supervisor.sh
+COPY rotate_log.sh /rotate_log.sh
# COPY debian.sources /etc/apt/sources.list.d/debian.sources
@@ -24,6 +26,8 @@ RUN apt-get update && apt-get install -y \
procps \
vim-tiny \
lua-cjson \
+ cron \
+ supervisor \
&& arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
&& wget -O /tmp/${RSPAMD_VER}~${CODENAME}_${arch}.deb https://rspamd.com/apt-stable/pool/main/r/rspamd/${RSPAMD_VER}~${CODENAME}_${arch}.deb \
&& apt install -y /tmp/${RSPAMD_VER}~${CODENAME}_${arch}.deb \
@@ -32,11 +36,14 @@ RUN apt-get update && apt-get install -y \
&& apt-get clean \
&& mkdir -p /run/rspamd \
&& chown _rspamd:_rspamd /run/rspamd \
- && chmod +x /rspamd.sh \
+ && chmod +x /rspamd.sh /stop-supervisor.sh /rotate_log.sh \
&& echo 'alias ll="ls -la --color"' >> ~/.bashrc
+COPY supervisord.conf /etc/supervisor/supervisord.conf
+
ENTRYPOINT ["/rspamd.sh"]
STOPSIGNAL SIGTERM
-CMD ["/usr/bin/rspamd", "-f", "-u", "_rspamd", "-g", "_rspamd"]
+# CMD ["/usr/bin/rspamd", "-f", "-u", "_rspamd", "-g", "_rspamd"]
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
diff --git a/Dockerfiles/rspamd/rotate_log.sh b/Dockerfiles/rspamd/rotate_log.sh
new file mode 100644
index 00000000..78fafd39
--- /dev/null
+++ b/Dockerfiles/rspamd/rotate_log.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+echo " ---- $(date) START ----"
+
+LOG_DIR="/var/log/rspamd"
+LOG_FILE="${LOG_DIR}/rspamd.log"
+DATE=$(date +%Y%m%d)
+BACKUP_FILE="${LOG_DIR}/rspamd-${DATE}.log"
+
+# Retention days
+RETENTION_DAYS=${RETENTION_DAYS:-7}
+# echo "Retention days: ${RETENTION_DAYS}"
+
+# backup log
+if [ -f "${LOG_FILE}" ]; then
+ echo "Backup log: ${LOG_FILE}"
+ mv "${LOG_FILE}" "${BACKUP_FILE}"
+
+ # Restart rspamd
+ /usr/bin/pkill -USR1 rspamd
+ if [ $? -ne 0 ]; then
+ echo "Restart rspamd"
+ /usr/bin/supervisorctl restart rspamd
+ fi
+
+else
+ echo "The log file does not exist: ${LOG_FILE}"
+ echo ""
+ exit 1
+fi
+
+# Compress backup files
+if [ -f "${BACKUP_FILE}.gz" ]; then
+ mv "${BACKUP_FILE}.gz" "${BACKUP_FILE}_1.gz"
+fi
+echo "Compressing: "${BACKUP_FILE}""
+gzip "${BACKUP_FILE}"
+
+# Clean up expiration logs
+echo "Cleaning up expiration logs:"
+find "${LOG_DIR}" -name "rspamd-*.log.gz" -type f -mtime +${RETENTION_DAYS} -print -delete
+
+echo " ---- $(date) END ----"
+echo ""
+
+# 10MB in bytes
+SIZE_THRESHOLD=$((10 * 1024 * 1024))
+TARGET_LOG="${LOG_DIR}/rotate_log.log"
+GZIP_LOG="${LOG_DIR}/rotate_log-${DATE}.log"
+# Check whether the target log file exceeds 10 m, if so, compress
+if [ -f "${TARGET_LOG}" ]; then
+ FILE_SIZE=$(stat -c %s "${TARGET_LOG}")
+
+ if [ ${FILE_SIZE} -gt ${SIZE_THRESHOLD} ]; then
+ echo "Log file ${TARGET_LOG} exceeds 10M, compress..."
+ mv "${TARGET_LOG}" "${GZIP_LOG}"
+ gzip "${GZIP_LOG}"
+ fi
+fi
+find "${LOG_DIR}" -name "rotate_log-*.gz" -type f -mtime +${RETENTION_DAYS} -delete
diff --git a/Dockerfiles/rspamd/rspamd.sh b/Dockerfiles/rspamd/rspamd.sh
index 372fcc89..5d09da25 100644
--- a/Dockerfiles/rspamd/rspamd.sh
+++ b/Dockerfiles/rspamd/rspamd.sh
@@ -1,6 +1,15 @@
#!/bin/bash
+if ! grep -q "rotate_log.sh" /var/spool/cron/crontabs/root; then
+ chmod +x /rotate_log.sh
+ echo "10 00 * * * bash /rotate_log.sh >> /var/log/rspamd/rotate_log.log 2>&1" >> /var/spool/cron/crontabs/root
+ chmod 600 /var/spool/cron/crontabs/root
+ chown root:crontab /var/spool/cron/crontabs/root
+ /usr/bin/supervisorctl restart cron
+fi
+
+
chmod 755 /var/lib/rspamd
chown -R _rspamd:_rspamd /var/lib/rspamd
diff --git a/Dockerfiles/rspamd/stop-supervisor.sh b/Dockerfiles/rspamd/stop-supervisor.sh
new file mode 100644
index 00000000..effb2a1e
--- /dev/null
+++ b/Dockerfiles/rspamd/stop-supervisor.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+printf "Start\n";
+
+while read line; do
+ echo "PROCESS event: $line" >&2;
+ kill -3 $(cat "/var/run/supervisord.pid")
+done < /dev/stdin
diff --git a/Dockerfiles/rspamd/supervisord.conf b/Dockerfiles/rspamd/supervisord.conf
new file mode 100644
index 00000000..f933d385
--- /dev/null
+++ b/Dockerfiles/rspamd/supervisord.conf
@@ -0,0 +1,40 @@
+[supervisord]
+nodaemon=true
+logfile=/dev/stdout
+logfile_maxbytes=0
+pidfile=/var/run/supervisord.pid
+user=root
+
+[program:rspamd]
+command=/usr/bin/rspamd -f -u _rspamd -g _rspamd
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+[program:cron]
+command=/usr/sbin/cron -f
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+user=root
+
+
+[eventlistener:processes]
+command=/stop-supervisor.sh
+events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock
+
+[unix_http_server]
+file=/var/run/supervisor.sock
+chmod=0700
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
diff --git a/docker-compose.yml b/docker-compose.yml
index 237c40ec..3ffcbccd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,7 +41,7 @@ services:
- redis
rspamd-billionmail:
- image: billionmail/rspamd:1.1
+ image: billionmail/rspamd:1.2
hostname: rspamd
depends_on:
- redis-billionmail
@@ -61,7 +61,7 @@ services:
- rspamd
dovecot-billionmail:
- image: billionmail/dovecot:1.4
+ image: billionmail/dovecot:1.5
hostname: dovecot
depends_on:
- pgsql-billionmail
@@ -102,7 +102,7 @@ services:
- dovecot
postfix-billionmail:
- image: billionmail/postfix:1.5
+ image: billionmail/postfix:1.6
hostname: postfix
depends_on:
pgsql-billionmail: