Compare commits
8 Commits
11_0_0-9_e
...
11_0_0-12_
| Author | SHA1 | Date | |
|---|---|---|---|
| 4ba4af692a | |||
| 1b6e9088fd | |||
| 2b17a8653d | |||
| 302f649f00 | |||
| ec4d24ba46 | |||
| 136ed02b53 | |||
| 185a02376e | |||
| 33e2000fc6 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@
|
||||
*.log
|
||||
*spec-20*
|
||||
*.tar.xz
|
||||
*.bak
|
||||
|
||||
@@ -15,7 +15,14 @@ SMEServer Koozali developed git repo for smeserver-qpsmtpd smeserver
|
||||
<br />https://wiki.koozali.org/Qpsmtpd:helo
|
||||
|
||||
## Bugzilla
|
||||
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-qpsmtpd&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
|
||||
Show list of outstanding bugs:
|
||||
[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-qpsmtpd&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-qpsmtpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-qpsmtpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-qpsmtpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-qpsmtpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-qpsmtpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-qpsmtpd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
|
||||
## Description
|
||||
|
||||
|
||||
19
createlinks
19
createlinks
@@ -86,6 +86,7 @@ for $daemon ( qw(qpsmtpd sqpsmtpd uqpsmtpd) )
|
||||
spool_dir
|
||||
subject_prefix
|
||||
invalid_resolvable_fromhost
|
||||
smtproutes
|
||||
timeout
|
||||
timeoutsmtpd
|
||||
tls_before_auth
|
||||
@@ -93,6 +94,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
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
TEMPLATE_PATH="/var/service/qpsmtpd/config/rcpthosts"
|
||||
UID="root"
|
||||
GID="root"
|
||||
PERMS=0644
|
||||
@@ -0,0 +1,5 @@
|
||||
TEMPLATE_PATH="/var/service/qpsmtpd/config/smtproutes"
|
||||
UID="root"
|
||||
GID="root"
|
||||
PERMS=0644
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
TEMPLATE_PATH="/var/service/qpsmtpd/config/rcpthosts"
|
||||
UID="root"
|
||||
GID="root"
|
||||
PERMS=0644
|
||||
@@ -0,0 +1,5 @@
|
||||
TEMPLATE_PATH="/var/service/qpsmtpd/config/smtproutes"
|
||||
UID="root"
|
||||
GID="root"
|
||||
PERMS=0644
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
queue/postfix-queue FLAG_MASK_EXTERNAL
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
#return "# DelegateMailServer set" if $DelegateMailServer;
|
||||
|
||||
return "queue/qmail-queue";
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
return "" unless (defined $ExternalIP);
|
||||
|
||||
return "[$ExternalIP]";
|
||||
}
|
||||
@@ -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.
|
||||
#
|
||||
}
|
||||
@@ -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";
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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 12
|
||||
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,15 @@ AutoReqProv: no
|
||||
SME Server qpsmtpd smtpd module
|
||||
|
||||
%changelog
|
||||
* Tue Jan 14 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-12.sme
|
||||
- fix /bin/sh is needed because of pretrans scriptlet [SME: 12871]
|
||||
|
||||
* Mon Nov 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-11.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]
|
||||
@@ -1080,16 +1088,6 @@ if [ $1 -gt 1 ] ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
%pretrans
|
||||
TEMPLATES_DIR=/etc/e-smith/templates/var/service/qpsmtpd/config/peers
|
||||
[ -L $TEMPLATES_DIR/0 ] && rm -f $TEMPLATES_DIR/0
|
||||
[ -L $TEMPLATES_DIR/local ] && rm -f $TEMPLATES_DIR/local
|
||||
[ -L /var/service/sqpsmtpd/config ] && rm -f /var/service/sqpsmtpd/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
|
||||
|
||||
%post
|
||||
|
||||
#Fix spool perms on clam upgrade
|
||||
|
||||
Reference in New Issue
Block a user