diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-07-14 10:34:36 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-07-14 10:34:36 -0300 |
| commit | cc90e80a1e3a330d3e2069fa4da19c91493fff41 (patch) | |
| tree | 168a05570ccca9894076760a8f1ecbbcb15256fc | |
| parent | 23c31dc2655078f04c0d772585672ceaa2ab35d3 (diff) | |
| download | puppet-mail-cc90e80a1e3a330d3e2069fa4da19c91493fff41.tar.gz puppet-mail-cc90e80a1e3a330d3e2069fa4da19c91493fff41.tar.bz2 | |
Using $postfix_anon_sasl
| -rw-r--r-- | manifests/header_checks.pp | 14 | ||||
| -rw-r--r-- | manifests/system.pp | 1 | ||||
| -rw-r--r-- | templates/postfix/header_checks.erb | 2 |
3 files changed, 2 insertions, 15 deletions
diff --git a/manifests/header_checks.pp b/manifests/header_checks.pp index 8b74a5e..d58d1c3 100644 --- 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 9a67de4..ac39929 100644 --- 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 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 |