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

* Mon Oct 21 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme

Browse Source 
- fix configuration for auth per deamon [SME: 12451]
- remove deamontools requirement [SME: 12615]
This commit is contained in:
Jean-Philippe Pialasse 2024-10-21 23:40:51 -04:00
parent 073a985ff2
commit c299cf93c5
8 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication
View File

@ -1 +1 @@
enabled disabled

1
root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication
View File

@ -1 +0,0 @@
enabled

1
root/etc/e-smith/db/configuration/defaults/uqpsmtpd/Authentication
View File

@ -1 +0,0 @@
enabled

5
root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap Normal file
View File

@ -0,0 +1,5 @@
{
my $auth_smtp = ($qpsmtpd{Authentication} eq 'enabled') ? 'yes' : 'no';
return "# auth/auth_imap disabled " if $auth_smtp eq "no";
$OUT = "auth/auth_imap 127.0.0.1 143";
}

5
root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/local/06auth_imap Normal file
View File

@ -0,0 +1,5 @@
{
my $auth_smtp = ($qpsmtpd{Authentication} eq 'enabled') ? 'yes' : 'no';
return "# auth/auth_imap disabled " if $auth_smtp eq "no";
$OUT = "auth/auth_imap 127.0.0.1 143";
}

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

@ -8,7 +8,7 @@ LimitDATA=150000000
LimitSTACK=150000000 LimitSTACK=150000000
LimitMEMLOCK=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 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/ WorkingDirectory=/var/service/sqpsmtpd/
ExecStartPre=/sbin/e-smith/service-status qpsmtpd ExecStartPre=/sbin/e-smith/service-status qpsmtpd
ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N

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

@ -8,7 +8,7 @@ LimitDATA=150000000
LimitSTACK=150000000 LimitSTACK=150000000
LimitMEMLOCK=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 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/ WorkingDirectory=/var/service/uqpsmtpd/
ExecStartPre=/sbin/e-smith/service-status uqpsmtpd ExecStartPre=/sbin/e-smith/service-status uqpsmtpd
ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N

9
smeserver-qpsmtpd.spec
View File

@ -4,7 +4,7 @@ Summary: SME Server qpsmtpd module
%define name smeserver-qpsmtpd %define name smeserver-qpsmtpd
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 8 %define release 9
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -18,7 +18,6 @@ Requires: perl(Mail::DKIM::DkSignature)
Requires: perl(ClamAV::Client) Requires: perl(ClamAV::Client)
Requires: perl(Mail::DMARC) Requires: perl(Mail::DMARC)
Requires: perl(Net::IMAP::Simple) >= 1.2212 Requires: perl(Net::IMAP::Simple) >= 1.2212
Requires: daemontools
Requires: qpsmtpd-plugins >= 0.0.1-sme04 Requires: qpsmtpd-plugins >= 0.0.1-sme04
Requires: ipsvd Requires: ipsvd
Requires: smeserver-lib >= 1.16.0-08 Requires: smeserver-lib >= 1.16.0-08
@ -47,6 +46,10 @@ AutoReqProv: no
SME Server qpsmtpd smtpd module SME Server qpsmtpd smtpd module
%changelog %changelog
* Mon Oct 21 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme
- fix configuration for auth per deamon [SME: 12451]
- remove deamontools requirement [SME: 12615]
* Thu Apr 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme * Thu Apr 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
- add listening deamon on submission port 587 [SME: 6510] - add listening deamon on submission port 587 [SME: 6510]
- move qpsmtpd daemons to full systemd supervision [SME: 12615] - move qpsmtpd daemons to full systemd supervision [SME: 12615]
@ -1083,6 +1086,8 @@ TEMPLATES_DIR=/etc/e-smith/templates/var/service/qpsmtpd/config/peers
[ -L $TEMPLATES_DIR/local ] && rm -f $TEMPLATES_DIR/local [ -L $TEMPLATES_DIR/local ] && rm -f $TEMPLATES_DIR/local
[ -L /var/service/sqpsmtpd/config ] && rm -f /var/service/sqpsmtpd/config [ -L /var/service/sqpsmtpd/config ] && rm -f /var/service/sqpsmtpd/config
[ -L /var/service/uqpsmtpd/config ] && rm -f /var/service/uqpsmtpd/config [ -L /var/service/uqpsmtpd/config ] && rm -f /var/service/uqpsmtpd/config
[ -L /etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap ] && rm -f /etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap
[ -L /etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap ] && rm -f /etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap
true true
%post %post