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

- handle dhparam via template [SME: 12965]

createlinks

@@ -21,6 +21,7 @@ event_link("adjust-dovecot", $event, "02");
 event_link("systemd-reload", $event, "89");
 event_link("systemd-default", $event, "88");
 templates2events("/etc/rsyslog.conf", $event);
+templates2events("/etc/dovecot/ssl/dhparam.pem", $event);
 
 # in case the ip change
 safe_symlink("sigusr2", "root/etc/e-smith/events/ip-change/services2adjust/dovecot");
@@ -37,3 +38,12 @@ safe_touch("root/home/e-smith/db/dovecot/sharedmailbox.db");
 
 templates2events("/home/e-smith/files/public/dovecot-acl", "email-update");
 
+
+$event = "dhparam-update";
+templates2events("/etc/dovecot/ssl/dhparam.pem", $event);
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/dovecot");
+
+$event = "smeserver-base-update";
+templates2events("/etc/dovecot/ssl/dhparam.pem", $event);
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/dovecot");
+

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
+

root/etc/e-smith/templates/etc/dovecot/dovecot.conf/70pluginImapSieve

@@ -10,7 +10,8 @@ plugin {
   sieve_plugins = sieve_imapsieve sieve_extprograms
   sieve_execute_bin_dir = /usr/libexec/dovecot
   sieve_pipe_bin_dir = /usr/libexec/dovecot
-  sieve_global_extensions = +vnd.dovecot.pipe +vnd.dovecot.execute
+  sieve_implicit_extensions = +vnd.dovecot.report
+  sieve_global_extensions = +vnd.dovecot.pipe +vnd.dovecot.execute  +vnd.dovecot.environment
 
 _EOF
 

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

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/

root/usr/libexec/dovecot/learn-ham.sh

@@ -1 +1 @@
-exec /usr/bin/spamc -L ham
+exec /usr/bin/spamc -u spamd --max-size=5283920 -L ham

root/usr/libexec/dovecot/learn-spam.sh

@@ -1 +1 @@
-exec /usr/bin/spamc -L spam
+exec /usr/bin/spamc -u spamd --max-size=5283920 -L spam

smeserver-dovecot.spec

@@ -1,5 +1,5 @@
 %define version 11.0.0
-%define release 14
+%define release 17
 %define name smeserver-dovecot
 
 
@@ -41,6 +41,14 @@ Configure the dovecot IMAP server with sieve scripts support,
 quota, ACL, extended logging, master user
 
 %changelog
+* Tue Mar 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-17.sme
+- handle dhparam via template [SME: 12965]
+
+* Sun Jan 19 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-15.sme
+- use spamd user for spams/ham learning [SME: 12265]
+  max size to learn hardocded to 5MB. 
+  per user spamassassin config is not supported
+
 * Sat Jan 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-14.sme
 - use esmith::ssl to set ciphers and protocol [SME: 12821]
   improve cipher order to get strongers first