Skip to content

Commit ea98ac6

Browse files
committed
[Postfix] Do not create a TLS SNI map when SKIP_LETS_ENCRYPT=y
1 parent 79f8a3c commit ea98ac6

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

data/Dockerfiles/postfix/postfix.sh

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,21 @@ EOF
2525
newaliases;
2626

2727
# create sni configuration
28-
echo -n "" > /opt/postfix/conf/sni.map;
29-
for cert_dir in /etc/ssl/mail/*/ ; do
30-
if [[ ! -f ${cert_dir}domains ]] || [[ ! -f ${cert_dir}cert.pem ]] || [[ ! -f ${cert_dir}key.pem ]]; then
31-
continue;
32-
fi
33-
IFS=" " read -r -a domains <<< "$(cat "${cert_dir}domains")"
34-
for domain in "${domains[@]}"; do
35-
echo -n "${domain} ${cert_dir}key.pem ${cert_dir}cert.pem" >> /opt/postfix/conf/sni.map;
36-
echo "" >> /opt/postfix/conf/sni.map;
28+
if [[ "${SKIP_LETS_ENCRYPT}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
29+
echo -n "" > /opt/postfix/conf/sni.map
30+
else
31+
echo -n "" > /opt/postfix/conf/sni.map;
32+
for cert_dir in /etc/ssl/mail/*/ ; do
33+
if [[ ! -f ${cert_dir}domains ]] || [[ ! -f ${cert_dir}cert.pem ]] || [[ ! -f ${cert_dir}key.pem ]]; then
34+
continue;
35+
fi
36+
IFS=" " read -r -a domains <<< "$(cat "${cert_dir}domains")"
37+
for domain in "${domains[@]}"; do
38+
echo -n "${domain} ${cert_dir}key.pem ${cert_dir}cert.pem" >> /opt/postfix/conf/sni.map;
39+
echo "" >> /opt/postfix/conf/sni.map;
40+
done
3741
done
38-
done
42+
fi
3943
postmap -F hash:/opt/postfix/conf/sni.map;
4044

4145
cat <<EOF > /opt/postfix/conf/sql/mysql_relay_ne.cf

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ services:
255255
- dovecot
256256

257257
postfix-mailcow:
258-
image: mailcow/postfix:1.58
258+
image: mailcow/postfix:1.59
259259
depends_on:
260260
- mysql-mailcow
261261
volumes:

0 commit comments

Comments
 (0)