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

* Mon Nov 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-10.sme

Browse Source 
- make compatible for postfix [SME: 1279]
  use postfix queue, qmail queue removed
  copy templates of rcpthosts to (us)qpsmtpd for rcpt_ok
  copy templates of smtproutes to (us)qpsmtpd for check_smtp_forward
This commit is contained in:
Jean-Philippe Pialasse 2024-12-16 23:21:59 -05:00
parent ec4d24ba46
commit 302f649f00
9 changed files with 115 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
createlinks
View File

@ -93,6 +93,24 @@ for $daemon ( qw(qpsmtpd sqpsmtpd uqpsmtpd) )
tls_protocols
));
templates2events("$config/$_", qw(
console-save
bootstrap-console-save
domain-create
domain-delete
ip-change
email-update
host-create
host-delete
host-modify
post-upgrade
smeserver-qpsmtpd-update
))
for (qw(
rcpthosts
smtproutes
));
templates2events("$config/badrcptto_ext", qw(
domain-create
domain-delete

1
root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/90queue-postfix-queue Normal file
View File

@ -0,0 +1 @@
queue/postfix-queue FLAG_MASK_EXTERNAL

5
root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/90queue-qmail-queue
View File

@ -1,5 +0,0 @@
{
#return "# DelegateMailServer set" if $DelegateMailServer;
return "queue/qmail-queue";
}

14
root/etc/e-smith/templates/var/service/qpsmtpd/config/rcpthosts/10standard Normal file
View File

@ -0,0 +1,14 @@
{
use esmith::DomainsDB;
my $ddb = esmith::DomainsDB->open_ro or die "Couldn't open DomainsDB\n";
my @rcpt_hosts = ( "$SystemName.$DomainName" );
foreach my $domain ( $ddb->get_all_by_prop( type => "domain" ) )
{
push @rcpt_hosts, $domain->key;
}
$OUT = join "\n", @rcpt_hosts;
}

5
root/etc/e-smith/templates/var/service/qpsmtpd/config/rcpthosts/12LiteralIP Normal file
View File

@ -0,0 +1,5 @@
{
return "" unless (defined $ExternalIP);
return "[$ExternalIP]";
}

25
root/etc/e-smith/templates/var/service/qpsmtpd/config/smtproutes/00README Normal file
View File

@ -0,0 +1,25 @@
{
#
# qmail's smtproutes mechanism works such that the LAST BEST match
# found in /var/qmail/control/smtproutes will be used in preference
# to any other entry.
#
# Consider the following /var/qmail/control/smtproutes example:
#
# :smarthost.somewhere
# domain.place:some.host
# domain.place:other.host
# :some.other.smarthost.elsewhere
#
# Mail for user@domain.place will ALWAYS be delivered to
# other.host. The entry for some.host will NEVER be used.
#
# Mail for any other domain will ALWAYS be delivered to
# some.other.smarthost.elsewhere. The entry for smarthost.somewhere
# will NEVER be used.
#
# Therefore, if you wish to make any customisations to the
# /var/qmail/control/smtproutes templates, you must ensure that they
# appear AFTER the standard e-smith template entries.
#
}

17
root/etc/e-smith/templates/var/service/qpsmtpd/config/smtproutes/10delegateMailServer Normal file
View File

@ -0,0 +1,17 @@
{
$OUT = "";
use esmith::DomainsDB;
my $ddb = esmith::DomainsDB->open_ro();
for my $domain ( $ddb->domains )
{
my $mail_server = $domain->prop('MailServer')
|| $DelegateMailServer
|| 'localhost';
next if ( $mail_server eq 'localhost' );
$OUT .= $domain->key . ":$mail_server\n";
}
}

28
root/etc/e-smith/templates/var/service/qpsmtpd/config/smtproutes/20SMTPSmartHost Normal file
View File

@ -0,0 +1,28 @@
{
$OUT = "";
#--------------------------------------------------
# Now check for SMTP smart host
#--------------------------------------------------
if (
$SMTPSmartHost
&&
($SMTPSmartHost ne 'off')
&&
($SMTPSmartHost !~ /^\s*$/)
)
{
# Is the smtp-auth-proxy enabled?
if (${'smtp-auth-proxy'}{'status'} eq 'enabled')
{
$OUT .= ":localhost:26";
}
else
{
$OUT .= ":$SMTPSmartHost";
}
}
chomp ($OUT);
}

9
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 9
%define release 10
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@ -21,7 +21,6 @@ Requires: perl(Net::IMAP::Simple) >= 1.2212
Requires: qpsmtpd-plugins >= 0.0.1-sme04
Requires: ipsvd
Requires: smeserver-lib >= 1.16.0-08
#Requires: smeserver-cvm-unix-local
Requires: smeserver-clamav >= 2.7.0
Obsoletes: e-smith-obtuse-smtpd
Obsoletes: e-smith-qmail-smtpd
@ -46,6 +45,12 @@ AutoReqProv: no
SME Server qpsmtpd smtpd module
%changelog
* Mon Nov 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-10.sme
- make compatible for postfix [SME: 1279]
use postfix queue, qmail queue removed
copy templates of rcpthosts to (us)qpsmtpd for rcpt_ok
copy templates of smtproutes to (us)qpsmtpd for check_smtp_forward
* 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]