hasufell
/
exherbo-dockermail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add spamassasin/pyzor/razor support and cleanup Dockerfile and config

This commit is contained in:
hasufell 2015-10-02 15:07:59 +02:00
parent 8d28bce22a
commit 88d71ce832
No known key found for this signature in database
GPG Key ID: 220CD1C5BDEED020
23 changed files with 91 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
core/Dockerfile
View File

@ -1,33 +1,28 @@
FROM hasufell/gentoo-amd64-paludis:latest
MAINTAINER Julian Ospald "hasufell@posteo.de"
# check these with "cave show <package-name>"
RUN echo -e "*/* acl bash-completion ipv6 kmod openrc pcre readline unicode \
zlib pam ssl sasl bzip2 urandom crypt tcpd \
-acpi -cairo -consolekit -cups -dbus -dri -gnome -gnutls -gtk -ogg -opengl \
-pdf -policykit -qt3support -qt5 -qt4 -sdl -sound -systemd -truetype -vim \
-vim-syntax -wayland -X" \
>> /etc/paludis/use.conf
##### PACKAGE INSTALLATION #####
RUN mkdir -p /etc/paludis/use.conf.d && echo -e \
"net-mail/dovecot cydir imapc maildir managesieve mbox mdbox pam pop3c \
sieve sqlite \
\n \
\nmail-mta/postfix dovecot-sasl mbox sasl" \
>> /etc/paludis/use.conf.d/mail.conf
# copy paludis config
COPY ./config/paludis /etc/paludis
# update world with our USE flags
RUN chgrp paludisbuild /dev/tty && cave resolve -c world -x
# install dovecot
RUN chgrp paludisbuild /dev/tty && cave resolve -z net-mail/dovecot mail-mta/postfix -x
# install mail set
RUN chgrp paludisbuild /dev/tty && cave resolve -c mail -x
# install tools
RUN chgrp paludisbuild /dev/tty && cave resolve -z app-admin/supervisor sys-process/htop -x
# install tools set
RUN chgrp paludisbuild /dev/tty && cave resolve -c tools -x
# update etc files... hope this doesn't screw up
RUN etc-update --automode -5
################################
##### APPLICATION CONFIG #####
# create dovecot certificates
RUN mkdir -p /var/tmp/dovecot-cert
RUN cp /usr/share/doc/dovecot-*/mkcert.sh /var/tmp/dovecot-cert/ ; \
@ -43,27 +38,45 @@ WORKDIR /
RUN rm -r /var/tmp/dovecot-cert
# create postfix certificates
RUN openssl req -new -x509 -nodes -out /etc/ssl/certs/postfix.pem -keyout /etc/ssl/private/postfix.key -days 3650 -subj '/CN=www.example.com'
RUN openssl req -new -x509 -nodes -out /etc/ssl/certs/postfix.pem -keyout \
/etc/ssl/private/postfix.key -days 3650 -subj '/CN=www.example.com'
# Postfix configuration
ADD ./config/postfix.main.cf /etc/postfix/main.cf
ADD ./config/postfix.master.cf.append /etc/postfix/master-additional.cf
ADD ./config/postfix/postfix.main.cf /etc/postfix/main.cf
ADD ./config/postfix/postfix.master.cf.append /etc/postfix/master-additional.cf
RUN cat /etc/postfix/master-additional.cf >> /etc/postfix/master.cf
RUN sed -r -i -e \
'/^smtp[[:space:]]+inet[[:space:]]+/a\ -o content_filter=spamassassin' \
/etc/postfix/master.cf
RUN newaliases -oA/etc/mail/aliases
# Dovecot configuration
COPY ./config/dovecot.mail /etc/dovecot/conf.d/10-mail.conf
COPY ./config/dovecot.ssl /etc/dovecot/conf.d/10-ssl.conf
COPY ./config/dovecot.auth /etc/dovecot/conf.d/10-auth.conf
COPY ./config/dovecot.master /etc/dovecot/conf.d/10-master.conf
COPY ./config/dovecot.lda /etc/dovecot/conf.d/15-lda.conf
COPY ./config/dovecot.imap /etc/dovecot/conf.d/20-imap.conf
COPY ./config/dovecot.sieve /etc/dovecot/conf.d/90-sieve.conf
COPY ./config/dovecot.managesieve /etc/dovecot/conf.d/20-managesieve.conf
COPY ./config/dovecot/dovecot.mail /etc/dovecot/conf.d/10-mail.conf
COPY ./config/dovecot/dovecot.ssl /etc/dovecot/conf.d/10-ssl.conf
COPY ./config/dovecot/dovecot.auth /etc/dovecot/conf.d/10-auth.conf
COPY ./config/dovecot/dovecot.master /etc/dovecot/conf.d/10-master.conf
COPY ./config/dovecot/dovecot.lda /etc/dovecot/conf.d/15-lda.conf
COPY ./config/dovecot/dovecot.imap /etc/dovecot/conf.d/20-imap.conf
COPY ./config/dovecot/dovecot.sieve /etc/dovecot/conf.d/90-sieve.conf
COPY ./config/dovecot/dovecot.managesieve \
/etc/dovecot/conf.d/20-managesieve.conf
# Uncomment to add verbose logging
COPY ./config/dovecot.logging /etc/dovecot/conf.d/10-logging.conf
COPY ./config/dovecot/dovecot.logging /etc/dovecot/conf.d/10-logging.conf
# spamassasin configuration
COPY ./config/spamassasin/spamassasin.local.append \
/etc/spamassassin/local.cf.append
RUN mkdir /etc/spamassassin/.pyzor /etc/spamassassin/.razor
COPY ./config/spamassasin/pyzor.servers /etc/spamassassin/.pyzor/servers
RUN cat /etc/spamassassin/local.cf.append >> /etc/spamassassin/local.cf
# supervisord configuration
COPY ./config/supervisord.conf /etc/supervisord.conf
##############################
# Nice place for your settings
VOLUME ["/mail_settings"]
@ -73,18 +86,10 @@ RUN chmod 755 /boot
COPY boot.d /boot.d
RUN chmod -R 755 /boot.d
# Add user vmail that owns mail
RUN groupadd -g 5000 vmail
RUN useradd -g vmail -u 5000 vmail -d /vmail -m
# create global sieve folder/rule
RUN mkdir -p /vmail/sieve && echo -e "require \"fileinto\";\
\nif header :contains \"X-Spam-Flag\" \"YES\" {\
\n fileinto \"Spam\";\
\n}" > /vmail/sieve/spam-global.sieve && \
chown -R vmail:vmail /vmail/sieve/
# Volume to store email
VOLUME ["/vmail"]

3
core/boot
View File

@ -25,6 +25,9 @@ postmap /etc/postfix/virtual
postmap /etc/postfix/virtual-mailbox-maps
chown -R postfix:postfix /etc/postfix
# add global sieve script
mkdir -p /vmail/sieve && cp /mail_settings/spam-global.sieve /vmail/sieve/
# Make user vmail own all mail folders
chown -R vmail:vmail /vmail
chmod u+w /vmail

8
core/boot.d/spamassasin Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
sa-update
razor-admin -home=/etc/spamassassin/.razor -register
razor-admin -home=/etc/spamassassin/.razor -create
razor-admin -home=/etc/spamassassin/.razor -discover

0
core/config/dovecot.auth → core/config/dovecot/dovecot.auth
View File

0
core/config/dovecot.imap → core/config/dovecot/dovecot.imap
View File

3
core/config/dovecot.lda → core/config/dovecot/dovecot.lda
View File

@ -1,3 +1,6 @@
lda_mailbox_autocreate = yes
lda_mailbox_autosubscribe = yes
protocol lda {
hostname = mail.docker.container
postmaster_address = postmaster@mail.docker.container

0
core/config/dovecot.logging → core/config/dovecot/dovecot.logging
View File

0
core/config/dovecot.mail → core/config/dovecot/dovecot.mail
View File

0
core/config/dovecot.managesieve → core/config/dovecot/dovecot.managesieve
View File

0
core/config/dovecot.master → core/config/dovecot/dovecot.master
View File

0
core/config/dovecot.sieve → core/config/dovecot/dovecot.sieve
View File

0
core/config/dovecot.ssl → core/config/dovecot/dovecot.ssl
View File

5
core/config/example/spam-global.sieve Normal file
View File

@ -0,0 +1,5 @@
require "fileinto";
if header :contains "X-Spam-Flag" "YES" {
fileinto "Spam";
}

1
core/config/paludis/keywords.conf.d/mail.conf Normal file
View File

@ -0,0 +1 @@
dev-python/pyzor ~amd64

5
core/config/paludis/sets/mail.conf Normal file
View File

@ -0,0 +1,5 @@
* net-mail/dovecot
* mail-mta/postfix
* mail-filter/spamassassin
* dev-python/pyzor
* mail-filter/razor

2
core/config/paludis/sets/tools.conf Normal file
View File

@ -0,0 +1,2 @@
* app-admin/supervisor
* sys-process/htop

1
core/config/paludis/use.conf.d/global.conf Normal file
View File

@ -0,0 +1 @@
*/* acl bash-completion ipv6 kmod openrc pcre readline unicode zlib pam ssl sasl bzip2 urandom crypt tcpd -acpi -cairo -consolekit -cups -dbus -dri -gnome -gnutls -gtk -ogg -opengl -pdf -policykit -qt3support -qt5 -qt4 -sdl -sound -systemd -truetype -vim -vim-syntax -wayland -X

2
core/config/paludis/use.conf.d/mail.conf Normal file
View File

@ -0,0 +1,2 @@
net-mail/dovecot cydir imapc maildir managesieve mbox mdbox pam pop3c sieve sqlite
nmail-mta/postfix dovecot-sasl mbox sasl

0
core/config/postfix.main.cf → core/config/postfix/postfix.main.cf
View File

6
core/config/postfix.master.cf.append → core/config/postfix/postfix.master.cf.append
View File

@ -1,5 +1,5 @@
dovecot unix - n n - - pipe
flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${recipient}
flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${recipient}
# we need to be permissive with the helo restrictions since the client can only
# authenticate after HELO has been sent
@ -13,3 +13,7 @@ submission inet n - n - - smtpd
-o smtpd_sender_restrictions=permit_sasl_authenticated,reject
-o smtpd_relay_restrictions=permit_sasl_authenticated,reject
-o smtpd_recipient_restrictions=permit_sasl_authenticated,reject
spamassassin unix - n n - - pipe
user=vmail:vmail argv=/usr/bin/spamc -f -e
/usr/sbin/sendmail -oi -f ${sender} ${recipient}

1
core/config/spamassasin/pyzor.servers Normal file
View File

@ -0,0 +1 @@
public.pyzor.org:24441

7
core/config/spamassasin/spamassasin.local.append Normal file
View File

@ -0,0 +1,7 @@
# you should leave this untouched
razor_config /etc/spamassassin/.razor/razor-agent.conf
pyzor_options --homedir /etc/spamassassin/.pyzor
# here goes your whitelist stuff for example
# whitelist_from user@example.com

7
core/config/supervisord.conf
View File

@ -1,11 +1,16 @@
[supervisord]
nodaemon=true
[program:spamassasin]
command=/usr/sbin/spamd
startsecs=2
autorestart=true
[program:postfix]
process_name=master
directory=/etc/postfix
command=/usr/sbin/postfix -c /etc/postfix start
startsecs=0
startsecs=1
autorestart=false
[program:dovecot]