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

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

Browse Source 
- 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:
Jean-Philippe Pialasse 2024-04-25 14:40:38 -04:00
parent 2d25c9d1ea
commit 2ac5875c1c
7 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
createlinks
View File

@ -9,6 +9,8 @@ use File::Path;
foreach (qw(
badmailfrom
badrcptto
bouncefrom
bouncehost
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(
/var/qmail/alias/.qmail-default
/var/qmail/alias/.qmail-localdelivery-default

2
root/etc/e-smith/templates/var/qmail/control/badmailfrom/10sample Normal file
View File

@ -0,0 +1,2 @@
#spamer@spamdomain.com
#@spamdomain.com

9
root/etc/e-smith/templates/var/qmail/control/badrcptto/00setup Normal file
View File

@ -0,0 +1,9 @@
{
require esmith::AccountsDB;
require esmith::DomainsDB;
%Accounts = esmith::AccountsDB->as_hash;
%Domains = esmith::DomainsDB->as_hash;
"";
}

16
root/etc/e-smith/templates/var/qmail/control/badrcptto/10blockVisibleInternal Normal file
View File

@ -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";
}
}
}

14
root/etc/e-smith/templates/var/qmail/control/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/qmail/control/rcpthosts/12LiteralIP Normal file
View File

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

8
smeserver-qmail.spec
View File

@ -4,7 +4,7 @@ Summary: startup scripts for Dan Bernstein's qmail package
%define name smeserver-qmail
Name: %{name}
%define version 11.0.0
%define release 6
%define release 7
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@ -29,6 +29,12 @@ Provides: e-smith-qmail
AutoReqProv: no
%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
- Update createlinks to create smeserver-package-update event[SME: 12579]