X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Famavis%2F50-user;h=28ba3fdbdbf6e0556194d4e00c01849c7249fd4e;hp=85fc7820f5b79a060b62f38da896ef8464a2abe5;hb=24a1c6819f32cbe8fb08d2a696084401230b0e3f;hpb=a3c62c7467c9c8af1cdc124bdc8a6084fb36f5a3

diff --git a/etc/amavis/50-user b/etc/amavis/50-user
index 85fc782..28ba3fd 100644
--- a/etc/amavis/50-user
+++ b/etc/amavis/50-user
@@ -4,11 +4,13 @@ use strict;
 @local_domains_acl =
  ( ".heureux-cyclage.org"
  , ".cyclocoop.org"
+ , ".ptitvelo.net"
+ , ".wiklou.org"
  );
 $max_servers = 2;
 
 ## LOGGING AND DEBUGGING
-$log_level = 1;
+$log_level = 2;
 # $logfile = undef;
 $do_syslog = 1;
 $syslog_ident = 'amavis';
@@ -20,14 +22,49 @@ $syslog_facility = 'mail';
 # $log_recip_templ = ... built-in default at the end of file amavisd
 # $log_templ = $log_short_templ;
 
-## MTA INTERFACE - INPUT
+## MTA INTERFACE
 $protocol = 'LMTP';
 @inet_acl = qw( 127.0.0.1 );
-$inet_socket_port = 10024;
+@mynetworks = qw(127.0.0.0/8 ::1/128);
+$inet_socket_port = [10024, 10026];
 
-## MTA INTERFACE - OUTPUT
-$notify_method  = 'smtp:[127.0.0.1]:10025';
-$forward_method = 'smtp:[127.0.0.1]:10025';
+$interface_policy{'10024'} = 'Net2Loc';
+$policy_bank{'Net2Loc'} = {
+	forward_method => 'smtp:[127.0.0.1]:10025',
+	notify_method  => 'smtp:[127.0.0.1]:10025',
+ };
+@dkim_signature_options_bysender_maps = (
+	{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } }
+ );
+
+dkim_key('heureux-cyclage.org', 'heureux-cyclage', '/var/lib/amavis/dkim/heureux-cyclage.org.pem');
+dkim_key('wiklou.org', 'wiklou', '/var/lib/amavis/dkim/wiklou.org.pem');
+dkim_key('ptitvelo.net', 'ptitvelo', '/var/lib/amavis/dkim/ptitvelo.net.pem');
+
+$interface_policy{'10026'} = 'Loc2Net';
+$policy_bank{'Loc2Net'} = {
+	forward_method => 'smtp:[127.0.0.1]:10027',
+	notify_method  => 'smtp:[127.0.0.1]:10027',
+	originating => 1,
+	enable_dkim_signing => 1,
+	smtpd_greeting_banner =>
+	 '${helo-name} ${protocol} ${product} Loc2Net service ready',
+	archive_quarantine_to_maps   => [],
+	banned_files_lovers_maps     => [1],
+	bounce_killer_score          => 0,
+	bypass_banned_checks_maps    => [1],
+	bypass_decode_parts          => 1,
+	bypass_header_checks_maps    => [1],
+	bypass_spam_checks_maps      => [1],
+	bypass_virus_checks_maps     => [1],
+	mynetworks_maps              => [],
+	os_fingerprint_method        => undef,
+	penpals_bonus_score          => undef,
+	remove_existing_spam_headers => undef,
+	remove_existing_x_scanned_headers => undef,
+	signed_header_fields         => { 'Sender' => 1 },
+	spam_lovers_maps             => [1],
+ };
 
 ## MODIFICATIONS TO PASSED MAIL
 #$prefer_our_added_header_fields{lc('X-CRM114-CacheID')} = 0;
@@ -54,11 +91,9 @@ $bad_header_quarantine_method = undef;
 $bad_header_quarantine_to = undef;
 $spam_quarantine_method = undef;
 $spam_quarantine_to = undef;
+$sa_spam_subject_tag = undef;
 $virus_quarantine_method = undef;
 $virus_quarantine_to = undef;
 $final_banned_destiny = D_PASS; # (defaults to D_BOUNCE)
 $final_spam_destiny = D_PASS; # (defaults to D_BOUNCE)
 $final_bad_header_destiny = D_PASS; # (defaults to D_PASS)
-
-#------------ Do not modify anything below this line -------------
-1;  # ensure a defined return