diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2005-12-11 00:00:25 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2005-12-11 00:00:25 +0000 |
| commit | a46f17dbd71ed0fec2afc2f3a92c26ae2d722ecc (patch) | |
| tree | 56b298b5b68e7ac063af0372c7f89687e04ea35e /amavis | |
| parent | 1a3238acd9fce2c4891189e3342d0745cf93b96a (diff) | |
Use ORG config if available. Auto-generate config.
Diffstat (limited to 'amavis')
| -rw-r--r-- | amavis/amavisd.conf.addon | 5 | ||||
| -rw-r--r-- | amavis/amavisd.conf.addon.in | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/amavis/amavisd.conf.addon b/amavis/amavisd.conf.addon index 49840bb..c9cd3be 100644 --- a/amavis/amavisd.conf.addon +++ b/amavis/amavisd.conf.addon @@ -5,7 +5,7 @@ # /etc/local-COMMON/amavisd.conf.addon # Copyright 2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: amavisd.conf.addon,v 1.34 2005-07-07 18:14:35 jonas Exp $ +# $Id: amavisd.conf.addon,v 1.35 2005-12-11 00:00:25 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -41,7 +41,7 @@ $virus_quarantine_to = 'virus-quarantine@'; $spam_quarantine_to = 'spam-quarantine@'; # We explicitly set local domains -my $local_domain_file="/etc/local-COMMON/amavis/local_domains_$mydomain"; +my $local_domain_file="/etc/local-ORG/amavis/local_domains"; if ( -f $local_domain_file ) { @local_domains_acl = undef; read_hash(\%local_domains, $local_domain_file); @@ -74,3 +74,4 @@ map { $spam_lovers{lc($_)}=1; } (qw( booking@dgi-huset.dk )); $bypass_spam_checks_acl = qw( spamalert@ spam.police@ ); +$bypass_spam_checks_acl = qw( spamalert@ spam.police@ ); diff --git a/amavis/amavisd.conf.addon.in b/amavis/amavisd.conf.addon.in index 5ed1034..95b4b56 100644 --- a/amavis/amavisd.conf.addon.in +++ b/amavis/amavisd.conf.addon.in @@ -3,7 +3,7 @@ # /etc/local-COMMON/amavisd.conf.addon # Copyright 2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: amavisd.conf.addon.in,v 1.14 2005-12-10 23:57:48 jonas Exp $ +# $Id: amavisd.conf.addon.in,v 1.15 2005-12-11 00:00:25 jonas Exp $ # # AMaViS configuration file addon (Debian package "amavisd-new") # @@ -39,7 +39,7 @@ $virus_quarantine_to = 'virus-quarantine@'; $spam_quarantine_to = 'spam-quarantine@'; # We explicitly set local domains -my $local_domain_file="/etc/local-COMMON/amavis/local_domains_$mydomain"; +my $local_domain_file="/etc/local-ORG/amavis/local_domains"; if ( -f $local_domain_file ) { @local_domains_acl = undef; read_hash(\%local_domains, $local_domain_file); |