You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/02/14 13:14:53 UTC
svn commit: r507503 - in /spamassassin/trunk/spamd-apache2:
bin/apache-spamd.pl lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm
lib/Mail/SpamAssassin/Spamd/Config.pm
Author: jm
Date: Wed Feb 14 04:14:52 2007
New Revision: 507503
URL: http://svn.apache.org/viewvc?view=rev&rev=507503
Log:
bug 4329: support --cf 'config line' option in apache-spamd, thanks to Radoslaw Zielinski
Modified:
spamassassin/trunk/spamd-apache2/bin/apache-spamd.pl
spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm
spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
Modified: spamassassin/trunk/spamd-apache2/bin/apache-spamd.pl
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd-apache2/bin/apache-spamd.pl?view=diff&rev=507503&r1=507502&r2=507503
==============================================================================
--- spamassassin/trunk/spamd-apache2/bin/apache-spamd.pl (original)
+++ spamassassin/trunk/spamd-apache2/bin/apache-spamd.pl Wed Feb 14 04:14:52 2007
@@ -218,6 +218,7 @@
push @directives, map qq(SANew $_ "$opt->{$_}"), grep defined $opt->{$_},
qw(PREFIX DEF_RULES_DIR LOCAL_RULES_DIR LOCAL_STATE_DIR);
push @directives, 'SANew paranoid 1' if $opt->{paranoid};
+ push @directives, qq(SAConfigLine "$_") for @{ $opt->{cf} };
my @users;
push @users, 'local' if $opt->{'user-config'};
Modified: spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm?view=diff&rev=507503&r1=507502&r2=507503
==============================================================================
--- spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm (original)
+++ spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm Wed Feb 14 04:14:52 2007
@@ -204,6 +204,19 @@
errmsg => 'SALocale xx_XX',
};
+=item C<SAConfigLine "config line">
+
+Equivalent of the C<--cf> option for spamassassin / spamd / sa-learn.
+
+=cut
+
+push @directives, { # inherited
+ name => 'SAConfigLine',
+ args_how => Apache2::Const::TAKE1,
+ req_override => Apache2::Const::RSRC_CONF,
+ errmsg => 'SAConfigLine "body NEWRULE /text/"',
+};
+
Apache2::Module::add(__PACKAGE__, \@directives);
}
@@ -283,6 +296,14 @@
if $parms->server->is_virtual;
my $srv_cfg = Apache2::Module::get_config($self, $parms->server);
$srv_cfg->{sa_locale} = $arg;
+}
+
+
+sub SAConfigLine {
+ my ($self, $parms, $arg) = @_;
+ my $srv_cfg = Apache2::Module::get_config($self, $parms->server);
+ $srv_cfg->{post_config_text} .=
+ ( $srv_cfg->{post_config_text} ? "\n" : '' ) . $arg;
}
Modified: spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm?view=diff&rev=507503&r1=507502&r2=507503
==============================================================================
--- spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm (original)
+++ spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm Wed Feb 14 04:14:52 2007
@@ -95,24 +95,25 @@
allowed-ips|A=s@ round-robin!
allow-tell|l server-cert=s
auth-ident server-key=s
- configpath|C=s setuid-with-ldap
- create-prefs|c! setuid-with-sql|Q
- daemonize|d! siteconfigpath=s
- debug|D:s socketgroup=s
- groupname|g=s socketmode=s
- help|h socketowner=s
- ident-timeout=f socketpath=s
- ldap-config! sql-config|q!
- listen-ip|ip-address|i:s@ ssl
- local|L! syslog-socket=s
- max-children|m=i syslog|s=s
- max-conn-per-child=i timeout-child|t=i
- max-spare=i timeout-tcp|T=i
- min-children=i user-config!
- min-spare=i username|u=s
- paranoid|P! version|V
- pidfile|r=s virtual-config-dir=s
- port|p=s vpopmail|v!
+ cf=s@ setuid-with-ldap
+ configpath|C=s setuid-with-sql|Q
+ create-prefs|c! siteconfigpath=s
+ daemonize|d! socketgroup=s
+ debug|D:s socketmode=s
+ groupname|g=s socketowner=s
+ help|h socketpath=s
+ ident-timeout=f sql-config|q!
+ ldap-config! ssl
+ listen-ip|ip-address|i:s@ syslog-socket=s
+ local|L! syslog|s=s
+ max-children|m=i timeout-child|t=i
+ max-conn-per-child=i timeout-tcp|T=i
+ max-spare=i user-config!
+ min-children=i username|u=s
+ min-spare=i version|V
+ paranoid|P! virtual-config-dir=s
+ pidfile|r=s vpopmail|v!
+ port|p=s
home_dir_for_helpers|helper-home-dir|H:s
PREFIX=s