Configuring amavisd local_domains_acl

diff --git a/files/amavisd/05-domain_id b/files/amavisd/05-domain_id
new file mode 100644 (file)
index 0000000..be37f5c
--- /dev/null
+++ b/files/amavisd/05-domain_id
@@ -0,0 +1,19 @@
+use strict;
+
+# $mydomain is used just for convenience in the config files and it is not
+# used internally by amavisd-new except in the default X_HEADER_LINE (which
+# Debian overrides by default anyway).
+
+chomp($mydomain = `head -n 1 /etc/mailname`);
+
+# amavisd-new needs to know which email domains are to be considered local
+# to the administrative domain.  Only emails to "local" domains are subject
+# to certain functionality, such as the addition of spam tags.
+#
+# Default local domains to $mydomain and all subdomains.  Remember to
+# override or redefine this if $mydomain is changed later in the config
+# sequence.
+
+@local_domains_acl = ( "." );
+
+1;  # ensure a defined return

diff --git a/manifests/amavisd.pp b/manifests/amavisd.pp
index 7c0bcb0d6a5650cf76b820a238b01ca0e13f9664..75b4b1c72d6a88e471c9b67dd9c5b8b914bf7d4a 100644 (file)
--- a/manifests/amavisd.pp
+++ b/manifests/amavisd.pp
@@ -9,6 +9,15 @@ class mail::amavisd {
     require => Package['clamav-freshclam'],
   }
 
+  file { "/etc/amavis/conf.d/05-domain_id":
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => 0644,
+    source => "puppet:///modules/mail/amavisd/05-domain_id",
+    notify => Service['amavisd'],
+  }
+
   file { "/etc/amavis/conf.d/15-content_filter_mode":
     ensure => present,
     owner  => root,