* Tue Mar 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-16.sme

- fix [SME: ]
2025-03-18 01:10:20 -04:00
parent 4ba0c22943
commit c821fef424
5 changed files with 21 additions and 6 deletions
--- a/root/etc/e-smith/templates.metadata/etc/dovecot/ssl/dhparam.pem
+++ b/root/etc/e-smith/templates.metadata/etc/dovecot/ssl/dhparam.pem
@@ -0,0 +1,6 @@
+TEMPLATE_PATH="/home/e-smith/dh.pem"
+OUTPUT_FILENAME="/etc/dovecot/ssl/dhparam.pem"
+UID="root"
+GID="root"
+PERMS=0644
+
--- a/root/sbin/e-smith/systemd/dovecot-control
+++ b/root/sbin/e-smith/systemd/dovecot-control
@@ -1,4 +0,0 @@
-#!/bin/bash
-# Create dhparam
-[ -e /etc/dovecot/ssl/dhparam.pem ] || \
-    RANDFILE=/dev/null /usr/bin/openssl dhparam -out /etc/dovecot/ssl/dhparam.pem 2048
--- a/root/usr/lib/systemd/system/dovecot.service.d/50koozali.conf
+++ b/root/usr/lib/systemd/system/dovecot.service.d/50koozali.conf
@@ -6,7 +6,7 @@ ExecStartPre=-/sbin/e-smith/service-status dovecot
 ExecStartPre=-/sbin/e-smith/expand-template /etc/dovecot/dovecot.conf
 ExecStartPre=-/sbin/e-smith/expand-template /etc/dovecot/master.users
 ExecStartPre=-/sbin/e-smith/expand-template /etc/dovecot/ssl/imapd.pem
-ExecStartPre=-/sbin/e-smith/systemd/dovecot-control
+ExecStartPre=-/sbin/e-smith/expand-template /etc/dovecot/ssl/dhparam.pem
 ExecStartPre=-/usr/sbin/portrelease dovecot
 Restart=always
 #SME:11733 needed for Dovecot quota-fs https://doc.dovecot.org/configuration_manual/quota/quota_fs/