Merge branch 'master' of github.com:msimerson/qpsmtpd-dev
This commit is contained in:
commit
1731542647
@ -27,7 +27,10 @@ use CPAN;
|
|||||||
use English qw( -no_match_vars );
|
use English qw( -no_match_vars );
|
||||||
|
|
||||||
my $apps = [
|
my $apps = [
|
||||||
# { app => 'mysql-server-5', info => { port => 'mysql50-server', dport=>'mysql5', yum =>'mysql-server'} },
|
{ app => 'daemontools', info => { } },
|
||||||
|
{ app => 'ucspi-tcp', info => { } },
|
||||||
|
# { app => 'dspam', info => { } },
|
||||||
|
# { app => 'mysql-server-55', info => { port => 'mysql55-server', dport=>'mysql5', yum =>'mysql-server'} },
|
||||||
# { app => 'apache22' , info => { port => 'apache22', dport=>'', yum => 'httpd' } },
|
# { app => 'apache22' , info => { port => 'apache22', dport=>'', yum => 'httpd' } },
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -388,7 +391,8 @@ sub name_overrides {
|
|||||||
# MacPorts ($dport), yum, and apt.
|
# MacPorts ($dport), yum, and apt.
|
||||||
my @modules = (
|
my @modules = (
|
||||||
{ module=>'LWP::UserAgent', info => { cat=>'www', port=>'p5-libwww', dport=>'p5-libwww-perl' }, },
|
{ module=>'LWP::UserAgent', info => { cat=>'www', port=>'p5-libwww', dport=>'p5-libwww-perl' }, },
|
||||||
{ module=>'Mail::Send' , info => { port => 'Mail::Tools', } },
|
{ module=>'Mail::Send' , info => { port => 'Mail::Tools', } },
|
||||||
|
{ module=>'Mail::SpamAssassin' , info => { cat => 'mail', } },
|
||||||
);
|
);
|
||||||
my ($match) = grep { $_->{module} eq $mod } @modules;
|
my ($match) = grep { $_->{module} eq $mod } @modules;
|
||||||
return $match if $match;
|
return $match if $match;
|
||||||
|
@ -59,7 +59,7 @@ dont_require_anglebrackets
|
|||||||
badmailfrom reject naughty
|
badmailfrom reject naughty
|
||||||
#badmailfromto
|
#badmailfromto
|
||||||
resolvable_fromhost reject 0
|
resolvable_fromhost reject 0
|
||||||
# sender_permitted_from reject 2
|
sender_permitted_from reject 1
|
||||||
|
|
||||||
# RCPT TO plugins
|
# RCPT TO plugins
|
||||||
badrcptto
|
badrcptto
|
||||||
@ -105,6 +105,9 @@ naughty reject data
|
|||||||
# queue the mail with qmail-queue
|
# queue the mail with qmail-queue
|
||||||
# queue/qmail-queue
|
# queue/qmail-queue
|
||||||
|
|
||||||
|
# forward to another mail server
|
||||||
|
# queue/smtp-forward 10.2.2.2 9025
|
||||||
|
|
||||||
|
|
||||||
# If you need to run the same plugin multiple times, you can do
|
# If you need to run the same plugin multiple times, you can do
|
||||||
# something like the following
|
# something like the following
|
||||||
|
Loading…
Reference in New Issue
Block a user