summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-21 20:24:41 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-21 20:24:41 -0200
commitc57525c03649a26d8691faf65295df8ee0a90acb (patch)
tree0f20e9f50c08f36059bff56599ca632ee53937c5 /manifests
parent5881e524282d57e8731a5846d755ce32a6e3406f (diff)
downloadpuppet-mail-c57525c03649a26d8691faf65295df8ee0a90acb.tar.gz
puppet-mail-c57525c03649a26d8691faf65295df8ee0a90acb.tar.bz2
TLS Policy already include at postfix module
Diffstat (limited to 'manifests')
-rw-r--r--manifests/system.pp1
-rw-r--r--manifests/tls.pp3
2 files changed, 1 insertions, 3 deletions
diff --git a/manifests/system.pp b/manifests/system.pp
index a9568a1..b810325 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -14,6 +14,7 @@ class mail::system {
$postfix_mydestination = '$myhostname, localhost.$mydomain, localhost'
$postfix_default_relay_domains = '$mydestination'
$postfix_mynetworks = hiera('postfix_mynetworks', "127.0.0.0/8")
+ $postfix_manage_tls_policy = hiera('postfix_manage_tls_policy', 'no')
case $sympa_subdomain {
'': { $sympa_subdomain = "lists" }
diff --git a/manifests/tls.pp b/manifests/tls.pp
index 0f63a56..d4d9246 100644
--- a/manifests/tls.pp
+++ b/manifests/tls.pp
@@ -7,9 +7,6 @@ class mail::tls {
postfix::config { "smtpd_tls_security_level": value => 'may' }
postfix::config { "smtp_tls_security_level": value => 'may' }
- # TLS Policy
- include postfix::tlspolicy
-
# SSL certificate
ssl::cert { "cert":
group => 'postfix',