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

Copy SSL snakeoil to the right place

Browse Source
This commit is contained in:
Val 2015-01-06 10:03:15 +00:00
parent 5ed7d82884
commit 3b45d333cf
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -5,10 +5,6 @@ RUN locale-gen en_GB en_GB.UTF-8 && dpkg-reconfigure locales
RUN apt-get update RUN apt-get update
RUN apt-get -y -q autoclean
RUN apt-get -y -q autoremove
RUN apt-get clean
# Prerequisites # Prerequisites
# install self-signed ssl certs # install self-signed ssl certs
RUN apt-get install -y --force-yes ssl-cert RUN apt-get install -y --force-yes ssl-cert
@ -47,13 +43,7 @@ ADD ./config/dovecot.imap /etc/dovecot/conf.d/20-imap.conf
# add verbose logging # add verbose logging
#ADD ./config/dovecot.logging /etc/dovecot/conf.d/10-logging.conf #ADD ./config/dovecot.logging /etc/dovecot/conf.d/10-logging.conf
# smtp port for incoming mail EXPOSE 25 143 587
EXPOSE 25
# imap port
EXPOSE 143
# smtp port for outgoing
EXPOSE 587
# todo: enable port 587 for outgoing mail, separate ports 25 and 587 # todo: enable port 587 for outgoing mail, separate ports 25 and 587
# http://www.synology-wiki.de/index.php/Zusaetzliche_Ports_fuer_Postfix # http://www.synology-wiki.de/index.php/Zusaetzliche_Ports_fuer_Postfix

2
config/postfix.main.cf
View File

@ -31,7 +31,7 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
myhostname = localhost myhostname = localhost
alias_maps = hash:/etc/aliases alias_maps = hash:/etc/aliases
alias_database = hash:/etc/aliases alias_database = hash:/etc/aliases
mydestination = /etc/mailname, 67b0a2fd2749, localhost.localdomain, localhost mydestination = /etc/mailname, localhost.localdomain, localhost
relayhost = relayhost =
mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
mailbox_size_limit = 0 mailbox_size_limit = 0

10
process_settings
View File

@ -1,17 +1,15 @@
# Check if we have SSL certificates in config, otherwise copy it there # Check if we have SSL certificates in config, otherwise copy it there
# First the key file # First the key file
if [ -f /mail_settings/ssl-cert-snakeoil.key ] if [ -f /mail_settings/ssl-cert-snakeoil.key ]; then
then
cp /mail_settings/ssl-cert-snakeoil.key /etc/ssl/private/ssl-cert-snakeoil.key cp /mail_settings/ssl-cert-snakeoil.key /etc/ssl/private/ssl-cert-snakeoil.key
else else
cp /etc/ssl/private/ssl-cert-snakeoil.key /mail_settings/ssl-cert-snakeoil.key cp /etc/ssl/private/ssl-cert-snakeoil.key /mail_settings/ssl-cert-snakeoil.key
fi fi
# Then the pem file # Then the pem file
if [ -f /mail_settings/ssl-cert-snakeoil.pem ] if [ -f /mail_settings/ssl-cert-snakeoil.pem ]; then
then cp /mail_settings/ssl-cert-snakeoil.pem /etc/ssl/certs/ssl-cert-snakeoil.pem
cp /mail_settings/ssl-cert-snakeoil.pem /etc/ssl/private/ssl-cert-snakeoil.pem
else else
cp /etc/ssl/private/ssl-cert-snakeoil.pem /mail_settings/ssl-cert-snakeoil.pem cp /etc/ssl/certs/ssl-cert-snakeoil.pem /mail_settings/ssl-cert-snakeoil.pem
fi fi
# Copy OpenDKIM config # Copy OpenDKIM config