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

Fix stuff

Browse Source
This commit is contained in:
Julian Ospald 2015-08-27 02:19:49 +02:00
parent 4c241564f0
commit 6f2aab778e
6 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/Dockerfile
View File

@ -46,6 +46,7 @@ RUN openssl req -new -x509 -nodes -out /etc/ssl/certs/postfix.pem -keyout /etc/s
ADD ./config/postfix.main.cf /etc/postfix/main.cf ADD ./config/postfix.main.cf /etc/postfix/main.cf
ADD ./config/postfix.master.cf.append /etc/postfix/master-additional.cf ADD ./config/postfix.master.cf.append /etc/postfix/master-additional.cf
RUN cat /etc/postfix/master-additional.cf >> /etc/postfix/master.cf RUN cat /etc/postfix/master-additional.cf >> /etc/postfix/master.cf
RUN newaliases -oA/etc/mail/aliases
# Dovecot configuration # Dovecot configuration
COPY ./config/dovecot.mail /etc/dovecot/conf.d/10-mail.conf COPY ./config/dovecot.mail /etc/dovecot/conf.d/10-mail.conf

15
core/boot
View File

@ -1,20 +1,5 @@
#!/bin/bash #!/bin/bash
# Check if we have SSL certificates in config, otherwise copy it there
# First the key file
if [ -f /mail_settings/ssl-cert-snakeoil.key ]; then
cp /mail_settings/ssl-cert-snakeoil.key /etc/ssl/private/ssl-cert-snakeoil.key
else
cp /etc/ssl/private/ssl-cert-snakeoil.key /mail_settings/ssl-cert-snakeoil.key
fi
# Then the pem file
if [ -f /mail_settings/ssl-cert-snakeoil.pem ]; then
cp /mail_settings/ssl-cert-snakeoil.pem /etc/ssl/certs/ssl-cert-snakeoil.pem
else
cp /etc/ssl/certs/ssl-cert-snakeoil.pem /mail_settings/ssl-cert-snakeoil.pem
fi
# Update hostname if given # Update hostname if given
if [ -f /mail_settings/myhostname ]; then if [ -f /mail_settings/myhostname ]; then

2
core/config/dovecot.ssl
View File

@ -1,5 +1,5 @@
ssl = yes ssl = yes
disable_plaintext_auth = yes disable_plaintext_auth = no
ssl_cert = </etc/ssl/certs/dovecot.pem ssl_cert = </etc/ssl/certs/dovecot.pem
ssl_key = </etc/ssl/private/dovecot.pem ssl_key = </etc/ssl/private/dovecot.pem

10
core/config/postfix.main.cf
View File

@ -29,9 +29,9 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
# information on enabling SSL in the smtp client. # information on enabling SSL in the smtp client.
myhostname = localhost myhostname = localhost
alias_maps = hash:/etc/aliases #alias_maps = hash:/etc/mail/aliases
alias_database = hash:/etc/aliases #alias_database = hash:/etc/mail/aliases
mydestination = /etc/mailname, localhost.localdomain, localhost mydestination = localhost.localdomain, localhost
relayhost = relayhost =
mynetworks = 127.0.0.0/8 [::1]/128 mynetworks = 127.0.0.0/8 [::1]/128
mailbox_size_limit = 0 mailbox_size_limit = 0
@ -58,8 +58,8 @@ smtpd_relay_restrictions = permit_auth_destination, permit_mynetworks, reject
smtpd_recipient_restrictions = permit smtpd_recipient_restrictions = permit
# Delivery to dovecot # Delivery to dovecot
alias_maps = hash:/etc/aliases #alias_maps = hash:/etc/mail/aliases
alias_database = hash:/etc/aliases #alias_database = hash:/etc/mail/aliases
virtual_alias_maps = hash:/etc/postfix/virtual virtual_alias_maps = hash:/etc/postfix/virtual
virtual_mailbox_domains = /etc/postfix/virtual-mailbox-domains virtual_mailbox_domains = /etc/postfix/virtual-mailbox-domains
virtual_mailbox_maps = hash:/etc/postfix/virtual-mailbox-maps virtual_mailbox_maps = hash:/etc/postfix/virtual-mailbox-maps

2
core/config/postfix.master.cf.append
View File

@ -1,5 +1,5 @@
dovecot unix - n n - - pipe dovecot unix - n n - - pipe
flags=DRhu user=vmail:vmail argv=/usr/lib/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 # we need to be permissive with the helo restrictions since the client can only
# authenticate after HELO has been sent # authenticate after HELO has been sent

2
core/config/supervisord.conf
View File

@ -6,7 +6,7 @@ process_name=master
directory=/etc/postfix directory=/etc/postfix
command=/usr/sbin/postfix -c /etc/postfix start command=/usr/sbin/postfix -c /etc/postfix start
startsecs=0 startsecs=0
autorestart=true autorestart=false
[program:dovecot] [program:dovecot]
command=/usr/sbin/dovecot -c /etc/dovecot/dovecot.conf -F command=/usr/sbin/dovecot -c /etc/dovecot/dovecot.conf -F