docker/myvemail
1
0
Fork 0
mirror of https://git.myvelabs.com/docker/myvemail.git synced 2025-12-18 07:46:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed perl policy and at syntax

Browse source
This commit is contained in:
Myve 2024-08-14 17:48:59 +00:00
commit afb613e32d
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build/Dockerfile.alpine
View file

@ -8,6 +8,7 @@ LABEL description="MyveMail"
ENV MYVEMAIL_NGINX_USERGROUP=nginx ENV MYVEMAIL_NGINX_USERGROUP=nginx
ENV MYVEMAIL_OPENDKIM_CONF=/etc/opendkim/opendkim.conf ENV MYVEMAIL_OPENDKIM_CONF=/etc/opendkim/opendkim.conf
ENV MYVEMAIL_OPENDMARC_CONF=/etc/opendmarc/opendmarc.conf ENV MYVEMAIL_OPENDMARC_CONF=/etc/opendmarc/opendmarc.conf
ENV MYVEMAIL_POLICYD=/usr/bin/postfix-policyd-spf-perl
# Copy required files folders # Copy required files folders
ADD run/bin /usr/local/bin/ ADD run/bin /usr/local/bin/

3
build/Dockerfile.ubuntu
View file

@ -11,6 +11,7 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV MYVEMAIL_NGINX_USERGROUP=www-data ENV MYVEMAIL_NGINX_USERGROUP=www-data
ENV MYVEMAIL_OPENDKIM_CONF=/etc/opendkim.conf ENV MYVEMAIL_OPENDKIM_CONF=/etc/opendkim.conf
ENV MYVEMAIL_OPENDMARC_CONF=/etc/opendmarc.conf ENV MYVEMAIL_OPENDMARC_CONF=/etc/opendmarc.conf
ENV MYVEMAIL_POLICYD=/usr/sbin/postfix-policyd-spf-perl
# Copy required files folders # Copy required files folders
ADD run/bin /usr/local/bin/ 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 \ 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 \ postfix postfix-pcre \
dovecot-core dovecot-imapd dovecot-lmtpd \ dovecot-core dovecot-imapd dovecot-lmtpd \
postfix-policyd-spf-python opendkim opendkim-tools \ postfix-policyd-spf-perl opendkim opendkim-tools \
opendmarc \ opendmarc \
&& apt autoremove -y \ && apt autoremove -y \
&& apt clean \ && apt clean \

6
build/run/docker-entrypoint/init.d/50-cron.sh
View file

@ -6,19 +6,19 @@ atd
# Roundcube cleanup (daily) # Roundcube cleanup (daily)
while true while true
do do
at midnight -f /usr/share/webapps/roundcube/bin/cleandb.sh at -f /usr/share/webapps/roundcube/bin/cleandb.sh midnight
done & done &
# Update Postscreen Whitelists (daily) # Update Postscreen Whitelists (daily)
while true while true
do do
at midnight -f /usr/local/bin/postwhite/postwhite at -f /usr/local/bin/postwhite/postwhite midnight
done & done &
# Update Yahoo! IPs for Postscreen Whitelists (weekly) # Update Yahoo! IPs for Postscreen Whitelists (weekly)
while true while true
do do
at midnight sunday -f /usr/local/bin/postwhite/scrape_yahoo at -f /usr/local/bin/postwhite/scrape_yahoo midnight sunday
done & done &
# # Refresh ssl keys daily # # Refresh ssl keys daily

4
build/run/installer.sh
View file

@ -121,7 +121,7 @@ postconf -e "body_checks = pcre:/etc/postfix/body_checks"
# master.cf # master.cf
sed -e 's/^smtp .*smtpd$/# &/' \ sed -e 's/^smtp .*smtpd$/# &/' \
-e '/#smtp\|#smtpd\|#dnsblog\|#tlsproxy/ s/^#//' -i /etc/postfix/master.cf -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 # Enable submission
submission inet n - y - - smtpd submission inet n - y - - smtpd
@ -136,7 +136,7 @@ submission inet n - y - - smtpd
# SPF Policy # SPF Policy
policy unix - n n - 0 spawn policy unix - n n - 0 spawn
user=nobody argv=/usr/bin/postfix-policyd-spf-perl user=nobody argv=${MYVEMAIL_POLICYD}
master.cf master.cf
# Deleting Email Headers For Outgoing Emails # Deleting Email Headers For Outgoing Emails