* Thu Apr 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
- move qmail template from qpsmtpd [SME: 9492] badrcptto,badmailfrom,rcpthosts are for qmail-smtpd, they were used by qpsmtpd as a direct remplacement, some file override them now, moving to qmail alternative would be to drop them as long as qpsmptd is used in front
This commit is contained in:
parent
2d25c9d1ea
commit
2ac5875c1c
16
createlinks
16
createlinks
@ -9,6 +9,8 @@ use File::Path;
|
|||||||
|
|
||||||
|
|
||||||
foreach (qw(
|
foreach (qw(
|
||||||
|
badmailfrom
|
||||||
|
badrcptto
|
||||||
bouncefrom
|
bouncefrom
|
||||||
bouncehost
|
bouncehost
|
||||||
concurrencylocal
|
concurrencylocal
|
||||||
@ -42,6 +44,20 @@ foreach (qw(
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
templates2events("/var/qmail/control/badrcptto", qw(
|
||||||
|
user-create
|
||||||
|
user-delete
|
||||||
|
user-modify
|
||||||
|
group-create
|
||||||
|
group-delete
|
||||||
|
group-modify
|
||||||
|
pseudonym-create
|
||||||
|
pseudonym-delete
|
||||||
|
pseudonym-modify
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
foreach (qw(
|
foreach (qw(
|
||||||
/var/qmail/alias/.qmail-default
|
/var/qmail/alias/.qmail-default
|
||||||
/var/qmail/alias/.qmail-localdelivery-default
|
/var/qmail/alias/.qmail-localdelivery-default
|
||||||
|
@ -0,0 +1,2 @@
|
|||||||
|
#spamer@spamdomain.com
|
||||||
|
#@spamdomain.com
|
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
require esmith::AccountsDB;
|
||||||
|
require esmith::DomainsDB;
|
||||||
|
|
||||||
|
%Accounts = esmith::AccountsDB->as_hash;
|
||||||
|
%Domains = esmith::DomainsDB->as_hash;
|
||||||
|
|
||||||
|
"";
|
||||||
|
}
|
@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
foreach my $account ( keys %Accounts )
|
||||||
|
{
|
||||||
|
next unless ( exists $Accounts{$account}{Visible}
|
||||||
|
and $Accounts{$account}{Visible} eq "internal" );
|
||||||
|
|
||||||
|
$OUT .= "$account\n";
|
||||||
|
$OUT .= "$account\@$DomainName\n";
|
||||||
|
|
||||||
|
foreach my $domain ( keys %Domains )
|
||||||
|
{
|
||||||
|
next unless $Domains{$domain}{type} eq "domain";
|
||||||
|
$OUT .= "$account\@$domain\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -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]";
|
||||||
|
}
|
@ -4,7 +4,7 @@ Summary: startup scripts for Dan Bernstein's qmail package
|
|||||||
%define name smeserver-qmail
|
%define name smeserver-qmail
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
%define version 11.0.0
|
%define version 11.0.0
|
||||||
%define release 6
|
%define release 7
|
||||||
Version: %{version}
|
Version: %{version}
|
||||||
Release: %{release}%{?dist}
|
Release: %{release}%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
@ -29,6 +29,12 @@ Provides: e-smith-qmail
|
|||||||
AutoReqProv: no
|
AutoReqProv: no
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
|
||||||
|
- move qmail template from qpsmtpd [SME: 9492]
|
||||||
|
badrcptto,badmailfrom,rcpthosts are for qmail-smtpd, they were used by qpsmtpd
|
||||||
|
as a direct remplacement, some file override them now, moving to qmail
|
||||||
|
alternative would be to drop them as long as qpsmptd is used in front
|
||||||
|
|
||||||
* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-6.sme
|
* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-6.sme
|
||||||
- Update createlinks to create smeserver-package-update event[SME: 12579]
|
- Update createlinks to create smeserver-package-update event[SME: 12579]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user