* Thu Apr 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme

- add listening deamon on submission port 587 [SME: 6510]
- move qpsmtpd daemons to full systemd supervision [SME: 12615]
- separate configuration for the 3 qpsmtpd daemons [SME: 12451]
  increase default TLS version on u/sqpsmtpd as auth is required
- increase Softlimit  to 150M [SME: 12638]
- remove old qmail templates [SME: 9492]
  template for /var/qmail/control/{badrcptto,badmailfrom,rcpthosts}
  also import template for config/badmailfrom from smeserver-wbl
TODO organize peers content for u and s qpsmtpd
TODO check if more config modules needs per service config

root/usr/lib/systemd/system/qpsmtpd.service

@@ -1,16 +1,26 @@
 [Unit]
 Description=qpsmtpd
-After=network.target
-Conflicts=proqpsmtpdd.service
-Requires=runit.service
+After=network.target network-online.target
 
 [Service]
-Type=oneshot
+Type=simple
+LimitDATA=150000000
+LimitSTACK=150000000
+LimitMEMLOCK=150000000
+Environment=PORT=25 INSTANCES=40 INSTANCES_PER_IP=5 QPSMTPD_CONFIG=/var/service/qpsmtpd/config PATH=/var/qmail/bin:/bin:/usr/bin:/usr/local/bin TCPLOCALHOST=me
+WorkingDirectory=/var/service/qpsmtpd/
+
 ExecStartPre=/sbin/e-smith/service-status qpsmtpd
-ExecStart=/usr/bin/sv u /service/qpsmtpd
-ExecStop=/usr/bin/sv stop /service/qpsmtpd
-ExecReload=/usr/bin/sv h /service/qpsmtpd
-RemainAfterExit=yes
+ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N
+ExecStart=/usr/bin/qpsmtpd-forkserver \
+        -u qpsmtpd \
+        -l 0.0.0.0 \
+        -p $PORT \
+        -c $INSTANCES \
+        -m $INSTANCES_PER_IP
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+RestartSec=20s
 
 [Install]
 WantedBy=sme-server.target

root/usr/lib/systemd/system/sqpsmtpd.service

@@ -1,16 +1,26 @@
 [Unit]
-Description=sqpsmtpd
-After=network.target
-Conflicts=prosqpsmtpdd.service
-Requires=runit.service
+Description=qpsmtpd
+After=network.target network-online.target qpsmtpd.service
 
 [Service]
-Type=oneshot
-ExecStartPre=/sbin/e-smith/service-status sqpsmtpd
-ExecStart=/usr/bin/sv u /service/sqpsmtpd
-ExecStop=/usr/bin/sv stop /service/sqpsmtpd
-ExecReload=/usr/bin/sv h /service/sqpsmtpd
-RemainAfterExit=yes
+Type=simple
+LimitDATA=150000000
+LimitSTACK=150000000
+LimitMEMLOCK=150000000
+Environment=PORT=465 INSTANCES=40 INSTANCES_PER_IP=5 QPSMTPD_CONFIG=/var/service/sqpsmtpd/config PATH=/var/qmail/bin:/bin:/usr/bin:/usr/local/bin TCPLOCALHOST=me
+WorkingDirectory=/var/service/qpsmtpd/
+
+ExecStartPre=/sbin/e-smith/service-status qpsmtpd
+ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N
+ExecStart=/usr/bin/qpsmtpd-forkserver \
+        -u qpsmtpd \
+        -l 0.0.0.0 \
+        -p $PORT \
+        -c $INSTANCES \
+        -m $INSTANCES_PER_IP
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+RestartSec=20s
 
 [Install]
 WantedBy=sme-server.target

root/usr/lib/systemd/system/uqpsmtpd.service

@@ -0,0 +1,26 @@
+[Unit]
+Description=qpsmtpd on submission port
+After=network.target network-online.target qpsmtpd.service
+
+[Service]
+Type=simple
+LimitDATA=150000000
+LimitSTACK=150000000
+LimitMEMLOCK=150000000
+Environment=PORT=587 INSTANCES=40 INSTANCES_PER_IP=5 QPSMTPD_CONFIG=/var/service/uqpsmtpd/config PATH=/var/qmail/bin:/bin:/usr/bin:/usr/local/bin TCPLOCALHOST=me
+WorkingDirectory=/var/service/qpsmtpd/
+
+ExecStartPre=/sbin/e-smith/service-status uqpsmtpd
+ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N
+ExecStart=/usr/bin/qpsmtpd-forkserver \
+        -u qpsmtpd \
+        -l 0.0.0.0 \
+        -p $PORT \
+        -c $INSTANCES \
+        -m $INSTANCES_PER_IP
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+RestartSec=20s
+
+[Install]
+WantedBy=sme-server.target