smeserver/smeserver-qpsmtpd
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- change dhparam generation [SME: 12814]
This commit is contained in:
Jean-Philippe Pialasse
2025-03-18 00:57:21 -04:00
parent b492b495bd
commit 1c968bd743
7 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
createlinks
View File

@@ -212,3 +212,19 @@ safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/uqpsmtpd
templates2events("/etc/systemd/system-preset/49-koozali.preset", $event);
event_link("systemd-reload", $event, "89");
event_link("systemd-default", $event, "88");
$event = "dhparam-update";
templates2events("/var/service/qpsmtpd/ssl/dhparam.pem", $event);
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/qpsmtpd");
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/sqpsmtpd");
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/uqpsmtpd");
$event = "smeserver-base-update";
templates2events("/var/service/qpsmtpd/ssl/dhparam.pem", $event);
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/qpsmtpd");
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/sqpsmtpd");
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/uqpsmtpd");

5
root/etc/e-smith/templates.metadata/var/service/qpsmtpd/ssl/dhparam.pem Normal file
View File

@@ -0,0 +1,5 @@
TEMPLATE_PATH="/home/e-smith/dh.pem"
OUTPUT_FILENAME="/var/service/qpsmtpd/ssl/dhparam.pem"
UID="root"
GID="root"
PERMS=0644

4
root/sbin/e-smith/systemd/qpsmtpd-init
View File

@@ -30,10 +30,6 @@ export QPSMTPD_CONFIG=/var/service/$ServiceName/config
[ -e /var/service/qpsmtpd/config/badrcptto_patterns ] && \
rm -f /var/service/qpsmtpd/config/badrcptto_patterns
# Create dhparam
[ -s /var/service/qpsmtpd/ssl/dhparam.pem ] || \
RANDFILE=/dev/null /usr/bin/openssl dhparam -out /var/service/qpsmtpd/ssl/dhparam.pem 2048
# Create a default dkim key pair
[ -s /home/e-smith/dkim_keys/default/private ] || (\
RANDFILE=/dev/null /usr/bin/openssl genrsa -out /home/e-smith/dkim_keys/default/private 2048

1
root/usr/lib/systemd/system/qpsmtpd.service
View File

@@ -12,6 +12,7 @@ WorkingDirectory=/var/service/qpsmtpd/
ExecStartPre=/sbin/e-smith/service-status qpsmtpd
ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N
ExecStartPre=-/sbin/e-smith/expand-template /var/service/qpsmtpd/ssl/dhparam.pem
ExecStart=/usr/bin/qpsmtpd-forkserver \
-u qpsmtpd \
-l 0.0.0.0 \

1
root/usr/lib/systemd/system/sqpsmtpd.service
View File

@@ -12,6 +12,7 @@ WorkingDirectory=/var/service/sqpsmtpd/
ExecStartPre=/sbin/e-smith/service-status qpsmtpd
ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N
ExecStartPre=-/sbin/e-smith/expand-template /var/service/qpsmtpd/ssl/dhparam.pem
ExecStart=/usr/bin/qpsmtpd-forkserver \
-u qpsmtpd \
-l 0.0.0.0 \

1
root/usr/lib/systemd/system/uqpsmtpd.service
View File

@@ -12,6 +12,7 @@ WorkingDirectory=/var/service/uqpsmtpd/
ExecStartPre=/sbin/e-smith/service-status uqpsmtpd
ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N
ExecStartPre=-/sbin/e-smith/expand-template /var/service/qpsmtpd/ssl/dhparam.pem
ExecStart=/usr/bin/qpsmtpd-forkserver \
-u qpsmtpd \
-l 0.0.0.0 \

5
smeserver-qpsmtpd.spec
View File

@@ -4,7 +4,7 @@ Summary: SME Server qpsmtpd module
%define name smeserver-qpsmtpd
Name: %{name}
%define version 11.0.0
%define release 14
%define release 15
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -46,6 +46,9 @@ AutoReqProv: no
SME Server qpsmtpd smtpd module
%changelog
* Tue Mar 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-15.sme
- change dhparam generation [SME: 12814]
* Thu Mar 06 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-14.sme
- cleanup of qpsmptd spool [SME: 11671]