Using $postfix_anon_sasl

diff --git a/manifests/header_checks.pp b/manifests/header_checks.pp
index 8b74a5ee3b0ac645ee4a7bc820365375252b50cf..d58d1c396a903ef233dd208596069d0aecfcabb6 100644 (file)
--- a/manifests/header_checks.pp
+++ b/manifests/header_checks.pp
@@ -1,15 +1,3 @@
 class mail::header_checks {
-  # Header checks
-  postfix::config { "header_checks":
-    value   => 'regexp:/etc/postfix/header_checks',
-    require => File['/etc/postfix/header_checks'],
-  }
-
-  file { "/etc/postfix/header_checks":
-    ensure  => present,
-    owner   => root,
-    group   => root,
-    mode    => 0644,
-    content => template('mail/postfix/header_checks.erb'),
-  }
+  # Place additional header checks here
 }

diff --git a/manifests/system.pp b/manifests/system.pp
index 9a67de4e4723b4dda7692e4471dc4839f8cd59cd..ac399294598ed046e6e9c375f3751d28f6270fa4 100644 (file)
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -4,6 +4,7 @@ class mail::system {
   $postfix_use_dovecot_lda       = "yes"
   $postfix_use_schleuder         = "yes"
   $postfix_use_sympa             = "yes"
+  $postfix_anon_sasl             = "yes"
   $postfix_mydestination         = '$myhostname, localhost.$mydomain, localhost'
   $postfix_default_relay_domains = '$mydestination'
 

diff --git a/templates/postfix/header_checks.erb b/templates/postfix/header_checks.erb
deleted file mode 100644 (file)
index bca5914..0000000
--- a/templates/postfix/header_checks.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-/^Received: from (.* \([-._[:alnum:]]+ \[[.[:digit:]]{7,15}\]\)).*?([[:space:]]+).*\(Authenticated sender: ([^)]+)\).*by (<%= fqdn.gsub(/\./, '\.') %>) \(([^)]+)\) with (E?SMTPS?A?) id ([A-F[:digit:]]+).*/
-  REPLACE Received: from [127.0.0.1] (localhost [127.0.0.1])$2(Authenticated sender: $3)${2}with $6 id $7