fix(postfix): remove deprecated smtpd_tls_dh1024_param_file from main…

….cf (#160) NethServer/dev#7275
NethServer · Jan 22, 2025 · 56f124a · 56f124a
1 parent 96666be
commit 56f124a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 20 deletions.
diff --git a/imageroot/systemd/user/dhgen.service b/imageroot/systemd/user/dhgen.service
@@ -4,7 +4,6 @@ Description=Diffie-Hellman group generator
 [Service]
 Type=oneshot
 ExecStart=runagent generate-dhpem
-ExecStartPost=-runagent install-certificate postfix
 ExecStartPost=-runagent install-certificate dovecot
 WorkingDirectory=%S/state
 SyslogIdentifier=%N
diff --git a/postfix/README.md b/postfix/README.md
@@ -72,7 +72,6 @@ relevant:
 
 - `server.pem`, server TLS certificate
 - `server.key`, server certificate private key
-- `dh.pem`, Diffie-Hellman group
 
 ### `reload-config`
 

diff --git a/postfix/etc/ssl/postfix/dh.pem b/postfix/etc/ssl/postfix/dh.pem
diff --git a/postfix/usr/local/bin/import-certificate b/postfix/usr/local/bin/import-certificate
@@ -15,10 +15,6 @@ trap 'rm -rf ${tmpdir}' EXIT
 cd "${tmpdir}"
 tar x -o -f -
 
-if [ -s dh.pem ]; then
-    install -o root -g root -m 644 dh.pem "${dest}"/dh.pem
-fi
-
 if [ ! -s server.pem ] || [ ! -s server.key ]; then
     # empty file: abort
     exit 3

diff --git a/postfix/usr/local/lib/templates/main.cf b/postfix/usr/local/lib/templates/main.cf
@@ -122,7 +122,6 @@ smtp_tls_security_level = may
 smtpd_tls_loglevel = 1
 smtpd_tls_security_level = may
 smtpd_tls_chain_files = /etc/ssl/postfix/fullchain.pem
-smtpd_tls_dh1024_param_file = /etc/ssl/postfix/dh.pem
 smtpd_tls_received_header = yes
 smtpd_tls_auth_only = yes