You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2023/04/30 12:29:39 UTC
svn commit: r1909499 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
Author: hege
Date: Sun Apr 30 12:29:39 2023
New Revision: 1909499
URL: http://svn.apache.org/viewvc?rev=1909499&view=rev
Log:
Remove is_admin from: use_pyzor, pyzor_count_min, pyzor_welcomelist_min, pyzor_welcomelist_factor
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm?rev=1909499&r1=1909498&r2=1909499&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Sun Apr 30 12:29:39 2023
@@ -79,7 +79,7 @@ sub set_config {
my ($self, $conf) = @_;
my @cmds;
-=head1 ADMINISTRATOR OPTIONS
+=head1 USER SETTINGS
=over 4
@@ -91,26 +91,10 @@ Whether to use Pyzor, if it is available
push (@cmds, {
setting => 'use_pyzor',
- is_admin => 1,
default => 1,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_BOOL
});
-=item pyzor_fork (0|1) (default: 1)
-
-Instead of running Pyzor synchronously, fork separate process for it and
-read the results in later (similar to async DNS lookups). Increases
-throughput. Considered experimental on Windows, where default is 0.
-
-=cut
-
- push(@cmds, {
- setting => 'pyzor_fork',
- is_admin => 1,
- default => am_running_on_windows()?0:1,
- type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
- });
-
=item pyzor_count_min NUMBER (default: 5)
This option sets how often a message's body checksum must have been
@@ -124,7 +108,6 @@ set this to a relatively low value, e.g.
push (@cmds, {
setting => 'pyzor_count_min',
- is_admin => 1,
default => 5,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
});
@@ -132,7 +115,6 @@ set this to a relatively low value, e.g.
# Deprecated setting, the name makes no sense!
push (@cmds, {
setting => 'pyzor_max',
- is_admin => 1,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
code => sub {
my ($self, $key, $value, $line) = @_;
@@ -157,7 +139,6 @@ result. Final decision is made by pyzor
push (@cmds, {
setting => 'pyzor_welcomelist_min',
aliases => ['pyzor_whitelist_min'], # removed in 4.1
- is_admin => 1,
default => 10,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
});
@@ -174,11 +155,31 @@ For default setting this means: 50 repor
push (@cmds, {
setting => 'pyzor_welcomelist_factor',
aliases => ['pyzor_whitelist_factor'], # removed in 4.1
- is_admin => 1,
default => 0.2,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
});
+=back
+
+=head1 ADMINISTRATOR SETTINGS
+
+=over 4
+
+=item pyzor_fork (0|1) (default: 1)
+
+Instead of running Pyzor synchronously, fork separate process for it and
+read the results in later (similar to async DNS lookups). Increases
+throughput. Considered experimental on Windows, where default is 0.
+
+=cut
+
+ push(@cmds, {
+ setting => 'pyzor_fork',
+ is_admin => 1,
+ default => am_running_on_windows()?0:1,
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+ });
+
=item pyzor_timeout n (default: 5)
How many seconds you wait for Pyzor to complete, before scanning continues