From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 28 Nov 2010 17:10:15 +0000 (-0200)
Subject: Adding undecipherable_subject_tag amavis config
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2cac2459245a94aa06adc2f48a8da38893eb6b5d;p=puppet-mail.git

Adding undecipherable_subject_tag amavis config
---

diff --git a/files/amavisd/50-user b/files/amavisd/50-user
new file mode 100644
index 0000000..ddaab0f
--- /dev/null
+++ b/files/amavisd/50-user
@@ -0,0 +1,15 @@
+use strict;
+
+#
+# Place your configuration directives here.  They will override those in
+# earlier files.
+#
+# See /usr/share/doc/amavisd-new/ for documentation and examples of
+# the directives you can use in this file
+#
+
+# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=498832
+$undecipherable_subject_tag = undef;
+
+#------------ Do not modify anything below this line -------------
+1;  # ensure a defined return
diff --git a/manifests/amavisd.pp b/manifests/amavisd.pp
index 36c329c..720c15c 100644
--- a/manifests/amavisd.pp
+++ b/manifests/amavisd.pp
@@ -32,6 +32,15 @@ class mail::amavisd {
     notify => Service['amavis'],
   }
 
+  file { "/etc/amavis/conf.d/50-user":
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => 0644,
+    source => "puppet:///modules/mail/amavisd/50-user",
+    notify => Service['amavis'],
+  }
+
   group { 'amavis':
     ensure => present,
   }