7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Rspamd, PHP-FPM] Mount Rspamd maps, set correct permissions (WIP: edit in UI)

Browse Source 
[PHP-FPM] Update image, fixes #3091
[Web] Netfilter: Do not auto restart netfilter-mailcow but add a small hint to restart netfilter-mailcow after adding a ban to perm bans
[Web] Remove unused js script parameter
This commit is contained in:
andryyy
2019-10-25 08:31:31 +02:00
parent ccd9d934d6
commit bdf56971d5
6 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/Dockerfiles/phpfpm/Dockerfile
View File

@@ -4,8 +4,8 @@ LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
ENV APCU_PECL 5.1.17
ENV IMAGICK_PECL 3.4.4
#ENV MAILPARSE_PECL 3.0.2
ENV MEMCACHED_PECL 3.1.3
ENV REDIS_PECL 5.0.1
ENV MEMCACHED_PECL 3.1.4
ENV REDIS_PECL 5.0.2
RUN apk add -U --no-cache autoconf \
bash \

22
data/Dockerfiles/rspamd/docker-entrypoint.sh
View File

@@ -9,8 +9,6 @@ touch /etc/rspamd/rspamd.conf.local \
chmod 755 /var/lib/rspamd
[[ ! -f /etc/rspamd/override.d/worker-controller-password.inc ]] && echo '# Autogenerated by mailcow' > /etc/rspamd/override.d/worker-controller-password.inc
[[ ! -f /etc/rspamd/custom/sa-rules-heinlein ]] && echo '# Autogenerated by mailcow' > /etc/rspamd/custom/sa-rules-heinlein
[[ ! -f /etc/rspamd/custom/dovecot_trusted.map ]] && echo '# Autogenerated by mailcow' > /etc/rspamd/custom/dovecot_trusted.map
DOVECOT_V4=
DOVECOT_V6=
@@ -34,6 +32,26 @@ chown -R _rspamd:_rspamd /var/lib/rspamd \
/etc/rspamd/rspamd.conf.override \
/etc/rspamd/plugins.d
# Fix missing default global maps, if any
# These exists in mailcow UI and should not be removed
touch /etc/rspamd/custom/global_mime_from_blacklist.map \
/etc/rspamd/custom/global_rcpt_blacklist.map \
/etc/rspamd/custom/global_smtp_from_blacklist.map \
/etc/rspamd/custom/global_mime_from_whitelist.map \
/etc/rspamd/custom/global_rcpt_whitelist.map \
/etc/rspamd/custom/global_smtp_from_whitelist.map \
/etc/rspamd/custom/sa-rules \
/etc/rspamd/custom/dovecot_trusted.map \
/etc/rspamd/custom/ip_wl.map \
/etc/rspamd/custom/fishy_tlds.map \
/etc/rspamd/custom/bad_words.map \
/etc/rspamd/custom/bad_asn.map \
/etc/rspamd/custom/bad_words_de.map
# www-data (82) group needs to write to these files
chown -R _rspamd:82 /etc/rspamd/custom
chmod -R g+w /etc/rspamd/custom
# Run hooks
for file in /hooks/*; do
if [ -x "${file}" ]; then