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

initial commit of file from CVS for smeserver-spamassassin on Mon 10 Jul 08:42:51 BST 2023

Browse Source
This commit is contained in:
Brian Read
2023-07-10 08:42:51 +01:00
parent 582d2ee320
commit 7ae11e7fbd
50 changed files with 901 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
root/etc/e-smith/db/configuration/defaults/spamassassin/DNSAvailable Normal file
View File

@@ -0,0 +1 @@
yes

1
root/etc/e-smith/db/configuration/defaults/spamassassin/OkLanguages Normal file
View File

@@ -0,0 +1 @@
all

1
root/etc/e-smith/db/configuration/defaults/spamassassin/OkLocales Normal file
View File

@@ -0,0 +1 @@
all

1
root/etc/e-smith/db/configuration/defaults/spamassassin/RejectLevel Normal file
View File

@@ -0,0 +1 @@
0

1
root/etc/e-smith/db/configuration/defaults/spamassassin/ReportSafe Normal file
View File

@@ -0,0 +1 @@
0

1
root/etc/e-smith/db/configuration/defaults/spamassassin/Sensitivity Normal file
View File

@@ -0,0 +1 @@
medium

1
root/etc/e-smith/db/configuration/defaults/spamassassin/SkipRBLChecks Normal file
View File

@@ -0,0 +1 @@
0

1
root/etc/e-smith/db/configuration/defaults/spamassassin/SortSpam Normal file
View File

@@ -0,0 +1 @@
enabled

1
root/etc/e-smith/db/configuration/defaults/spamassassin/Subject Normal file
View File

@@ -0,0 +1 @@
[SPAM]

1
root/etc/e-smith/db/configuration/defaults/spamassassin/SubjectTag Normal file
View File

@@ -0,0 +1 @@
disabled

1
root/etc/e-smith/db/configuration/defaults/spamassassin/TagLevel Normal file
View File

@@ -0,0 +1 @@
5

1
root/etc/e-smith/db/configuration/defaults/spamassassin/UseBayes Normal file
View File

@@ -0,0 +1 @@
0

1
root/etc/e-smith/db/configuration/defaults/spamassassin/status Normal file
View File

@@ -0,0 +1 @@
disabled

1
root/etc/e-smith/db/configuration/defaults/spamassassin/type Normal file
View File

@@ -0,0 +1 @@
service

46
root/etc/e-smith/db/configuration/migrate/10spamassassin Normal file
View File

@@ -0,0 +1,46 @@
{
my $sa = $DB->get("spamassassin") or return;
my %old2new = (
required_hits => "TagLevel",
skip_rbl_checks => "SkipRBLChecks",
sort_spam => "SortSpam",
use_bayes => "UseBayes",
);
for my $key (keys %old2new)
{
next unless (exists $spamassassin{$key});
my $value = $DB->get_prop_and_delete('spamassassin', $key);
$DB->set_prop('spamassassin', $old2new{$key}, $value);
}
my $sortspam = $DB->get_prop('spamassassin', 'SortSpam');
if ($sortspam eq "0" or $sortspam eq "1")
{
$DB->set_prop('spamassassin', 'SortSpam',
($sortspam eq "1") ? "enabled" : "disabled");
}
my $value = $DB->get_prop_and_delete('spamassassin', 'rewrite_subject');
if (defined $value)
{
$DB->set_prop('spamassassin', 'SubjectTag',
($value ? 'enabled' : 'disabled'));
}
# migrate only interesting value from spamd and delete it
my $spamd = $DB->get("spamd");
if ($spamd){
my $SpamLearning = $DB->get_prop('spamassassin', 'SpamLearning') || "empty";
if ( exists $spamd{'SpamLearning'} && ! exists $spamassassin{'SpamLearning'} ) {
$DB->set_prop('spamassassin', 'SpamLearning', $spamd{'SpamLearning'});
}
$spamd->delete;
}
}

11
root/etc/e-smith/db/configuration/migrate/20sortspam Normal file
View File

@@ -0,0 +1,11 @@
{
my $dt = $DB->get_prop("qmail", "DeliveryType");
my $di = $DB->get_prop("qmail", "DeliveryInstruction");
return unless ($dt and $di);
return unless ($dt eq 'program' and $di eq 'sortspam');
$DB->set_prop("qmail", "DeliveryType", "");
$DB->set_prop("qmail", "DeliveryInstruction", "");
}

1
root/etc/e-smith/db/spamassassin/defaults/wbl.global/type Normal file
View File

@@ -0,0 +1 @@
list

1
root/etc/e-smith/db/spamassassin/defaults/wbl.global_to/type Normal file
View File

@@ -0,0 +1 @@
list

16
root/etc/e-smith/templates-user/.qmail/15sortspam Normal file
View File

@@ -0,0 +1,16 @@
{
use esmith::AccountsDB;
my $db = esmith::AccountsDB->open_ro or return "# AccountsDB: open failed";
my $user = $db->get($USERNAME) or return "# AccountsDB: No user $USERNAME";
my $do_sortspam = $user->prop('SortSpam')
|| $spamassassin{SortSpam}
|| "enabled";
return "# sortspam disabled" unless ($do_sortspam eq "enabled");
return qq(| condredirect $USERNAME-junkmail headermatch 'X-Spam-Status: Yes');
}

3
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10dns_available Normal file
View File

@@ -0,0 +1,3 @@
{
return "dns_available " . ($spamassassin{DNSAvailable} || 'yes');
}

1
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10internal_networks Normal file
View File

@@ -0,0 +1 @@
{ "internal_networks $LocalIP" }

1
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10lock_method Normal file
View File

@@ -0,0 +1 @@
{ "lock_method flock" }

7
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10ok_languages Normal file
View File

@@ -0,0 +1,7 @@
{
$langs = ($spamassassin{OkLanguages} || 'all');
return "" if $langs eq 'all';
$OUT = "loadplugin Mail::SpamAssassin::Plugin::TextCat\n";
$OUT .= "ok_languages $langs";
return $OUT;
}

3
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10ok_locales Normal file
View File

@@ -0,0 +1,3 @@
{
return "ok_locales " . ($spamassassin{OkLocales} || 'all');
}

2
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10paths Normal file
View File

@@ -0,0 +1,2 @@
bayes_path /var/spool/spamd/.spamassassin/bayes
bayes_file_mode 750

3
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10report_safe Normal file
View File

@@ -0,0 +1,3 @@
{
return "report_safe " . ($spamassassin{ReportSafe} || 0);
}

16
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10required_score Normal file
View File

@@ -0,0 +1,16 @@
{
my $sens = $spamassassin{Sensitivity} || 'medium';
my %sens2hits = (
'veryhigh' => 2,
'high' => 3,
'medium' => 5,
'low' => 7,
'verylow' => 9,
);
my $hits = ($sens eq 'custom') ? $spamassassin{TagLevel}
: $sens2hits{$sens};
return "required_score $hits";
}

7
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10rewrite_subject Normal file
View File

@@ -0,0 +1,7 @@
{
return "" unless ($spamassassin{SubjectTag} eq 'enabled');
return "" unless ($spamassassin{Subject});
return "rewrite_header Subject $spamassassin{Subject}";
}

3
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10skip_rbl_checks Normal file
View File

@@ -0,0 +1,3 @@
{
return "skip_rbl_checks " . ($spamassassin{SkipRBLChecks} || 0);
}

4
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10trusted_networks Normal file
View File

@@ -0,0 +1,4 @@
{
$OUT = "clear_trusted_networks\n";
$OUT .= "trusted_networks $LocalIP " . ($spamassassin{TrustedNetworks} || '');
}

8
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10use_auto_whitelist Normal file
View File

@@ -0,0 +1,8 @@
{
if (($spamassassin{UseAutoWhitelist} || "0") eq "1")
{
$OUT = "use_auto_whitelist 1\n";
$OUT .= "auto_whitelist_path /var/spool/spamd/.spamassassin/auto-whitelist\n";
$OUT .= "auto_whitelist_file_mode 750\n";
}
}

3
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10use_bayes Normal file
View File

@@ -0,0 +1,3 @@
{
return "use_bayes " . ($spamassassin{UseBayes} || 0);
}

18
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10use_bayes_auto_learn Normal file
View File

@@ -0,0 +1,18 @@
{
return "# bayes disabled" unless $spamassassin{UseBayes};
my $AutoLearn = $spamassassin{UseBayesAutoLearn} || 0;
# default SA value of 12 is too high
my $BayesAutoLearnThresholdSpam = $spamassassin{'BayesAutoLearnThresholdSpam'}||6;
# 0.10 is spamassassin default but it is too high, set to -1.15.
my $BayesAutoLearnThresholdNonspam = $spamassassin{'BayesAutoLearnThresholdNonSpam'}|| -1.15;
# should get at least 6: 3 from body and 3 from header.
# http://spamassassin.apache.org/full/3.1.x/doc/Mail_SpamAssassin_Plugin_AutoLearnThreshold.html
$BayesAutoLearnThresholdSpam = 6 unless $BayesAutoLearnThresholdSpam >= 6;
$OUT = "bayes_auto_learn $AutoLearn\n";
return unless $AutoLearn == 1;
$OUT .= "bayes_auto_learn_threshold_nonspam $BayesAutoLearnThresholdNonspam\n";
$OUT .= "bayes_auto_learn_threshold_spam $BayesAutoLearnThresholdSpam\n";
}

2
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/20detail_header Normal file
View File

@@ -0,0 +1,2 @@
add_header all Status _YESNO_, score=_SCORE_ required=_REQD_ autolearn=_AUTOLEARN_
add_header all Details _REPORT_

8
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/50pyzor_timeout Normal file
View File

@@ -0,0 +1,8 @@
{
my $pyzor_timeout = ($spamassassin{PyzorTimeout} || 0);
if ($pyzor_timeout ne '0')
{
return "pyzor_timeout " . ($pyzor_timeout);
}
}

20
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/60globalWBL Normal file
View File

@@ -0,0 +1,20 @@
{
use esmith::ConfigDB;
my $dbh = esmith::ConfigDB->open_ro('spamassassin')
|| die "Unable to open spamassassin configuration dbase.";
my %wbl = $dbh->get('wbl.global')->props;
$OUT = '';
my $parameter = "";
my $value = "";
while (($parameter,$value) = each(%wbl)) {
if ($parameter eq "type") {next;}
if ($value eq "White") {
$OUT .= "whitelist_from " . $parameter . "\n";
} elsif ($value eq "Black") {
$OUT .= "blacklist_from " . $parameter . "\n";
}
}
}

20
root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/70globalWBL_to Normal file
View File

@@ -0,0 +1,20 @@
{
use esmith::ConfigDB;
my $dbh = esmith::ConfigDB->open_ro('spamassassin')
|| die "Unable to open spamassassin configuration dbase.";
my %wbl = $dbh->get('wbl.global_to')->props;
$OUT = '';
my $parameter = "";
my $value = "";
while (($parameter,$value) = each(%wbl)) {
if ($parameter eq "type") {next;}
if ($value eq "White") {
$OUT .= "whitelist_to " . $parameter . "\n";
} elsif ($value eq "Black") {
$OUT .= "blacklist_to " . $parameter . "\n";
}
}
}

5
root/etc/e-smith/templates/etc/rsyslog.conf/32spamd Normal file
View File

@@ -0,0 +1,5 @@
#spamd
:programname, isequal, "spamd" /var/log/spamd/spamd.log
& stop

18
root/etc/e-smith/templates/etc/sysconfig/spamassassin/10options Normal file
View File

@@ -0,0 +1,18 @@
{
# Default options to spamd
#SPAMDOPTIONS="-c -m5 -H --razor-home-dir='/var/lib/razor/' --razor-log-file='sys-syslog'"
# previous sme9 options
# -u spamd --syslog=stderr --ipv4-only
my @args = qw(-u spamd -c -m5 -H --ipv4-only --razor-home-dir='/var/lib/razor/' --razor-log-file='sys-syslog');
my $bayes = $spamassassin{'UseBayes'} || '0';
my $tell = $spamassassin{'SpamLearning'} || 'disabled';
if ($bayes =~ m/^1|yes|on|enabled$/ && $tell =~ m/^1|yes|on|enabled$/){
push @args, '--allow-tell';
}
$OUT .= "SPAMDOPTIONS=\"@args\"";
}

13
root/etc/logrotate.d/spamd Normal file
View File

@@ -0,0 +1,13 @@
/var/log/spamd/spamd.log
{
missingok
notifempty
sharedscripts
delaycompress
su root root
create 600 root root
postrotate
/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
endscript
}