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

[Postfix] Do not create a TLS SNI map when SKIP_LETS_ENCRYPT=y

This commit is contained in:
andryyy 2021-01-08 12:39:40 +01:00
parent 79f8a3c2b5
commit ea98ac6442
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/Dockerfiles/postfix/postfix.sh
View File

@ -25,6 +25,9 @@ EOF
newaliases; newaliases;
# create sni configuration # create sni configuration
if [[ "${SKIP_LETS_ENCRYPT}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
echo -n "" > /opt/postfix/conf/sni.map
else
echo -n "" > /opt/postfix/conf/sni.map; echo -n "" > /opt/postfix/conf/sni.map;
for cert_dir in /etc/ssl/mail/*/ ; do for cert_dir in /etc/ssl/mail/*/ ; do
if [[ ! -f ${cert_dir}domains ]] || [[ ! -f ${cert_dir}cert.pem ]] || [[ ! -f ${cert_dir}key.pem ]]; then if [[ ! -f ${cert_dir}domains ]] || [[ ! -f ${cert_dir}cert.pem ]] || [[ ! -f ${cert_dir}key.pem ]]; then
@ -36,6 +39,7 @@ for cert_dir in /etc/ssl/mail/*/ ; do
echo "" >> /opt/postfix/conf/sni.map; echo "" >> /opt/postfix/conf/sni.map;
done done
done done
fi
postmap -F hash:/opt/postfix/conf/sni.map; postmap -F hash:/opt/postfix/conf/sni.map;
cat <<EOF > /opt/postfix/conf/sql/mysql_relay_ne.cf cat <<EOF > /opt/postfix/conf/sql/mysql_relay_ne.cf

2
docker-compose.yml
View File

@ -255,7 +255,7 @@ services:
- dovecot - dovecot
postfix-mailcow: postfix-mailcow:
image: mailcow/postfix:1.58 image: mailcow/postfix:1.59
depends_on: depends_on:
- mysql-mailcow - mysql-mailcow
volumes: volumes: