From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Wed, 31 May 2017 09:54:13 +0000 (+0200)
Subject: Enabling smtp_tls_peer mapping for test-mail02.pixelpark.net
X-Git-Tag: v0.1.0~2883^2~13
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6964d6f4dc95e26abd427fa4869b00a1706c439e;p=pixelpark%2Fhiera.git

Enabling smtp_tls_peer mapping for test-mail02.pixelpark.net
---

diff --git a/customer/pixelpark/test-mail02.pixelpark.net.yaml b/customer/pixelpark/test-mail02.pixelpark.net.yaml
index f5f88031..3446fa23 100644
--- a/customer/pixelpark/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark/test-mail02.pixelpark.net.yaml
@@ -57,6 +57,7 @@ infra::profile::sasl::application:
 # Global configurations
 infra::profile::postfix::aliases_file: '/etc/postfix/maps/aliases'
 infra::profile::postfix::aliases_source: 'puppet:///postfix_dir/maps/aliases'
+infra::profile::postfix::has_map_smtp_tls_peers: true
 
 ldap_server: 'ldap.pixelpark.com'
 ldap_port: '389'
@@ -154,24 +155,6 @@ infra::profile::postfix::configs:
     ensure: 'absent'
   smtp_sasl_auth_enable:
     ensure: 'absent'
-#  smtp_tls_cert_file:
-#    value: '/etc/postfix/ssl/wildcard.pixelpark.com-cert.pem'
-#  smtp_tls_enforce_peername:
-#    value: 'no'
-#  smtp_tls_key_file:
-#    value: '$smtp_tls_cert_file'
-#  smtp_tls_loglevel:
-#    value: '1'
-#  smtp_tls_note_starttls_offer:
-#    ensure: 'absent'
-#  smtp_tls_per_site:
-#    value: 'hash:/etc/postfix/maps/smtp-tls-peers'
-#  smtp_tls_policy_maps:
-#    ensure: 'absent'
-#  smtp_tls_session_cache_database:
-#    value: 'btree:${data_directory}/smtp_scache'
-#  smtp_use_tls:
-#    value: 'yes'
   smtpd_banner:
     value: '$myhostname ESMTP $mail_name $mail_version'
   smtpd_client_restrictions:
@@ -188,28 +171,10 @@ infra::profile::postfix::configs:
     ensure: 'absent'
   smtpd_sender_restrictions:
     ensure: 'absent'
-#  smtpd_tls_CAfile:
-#    ensure: 'absent'
-#  smtpd_tls_auth_only:
-#    ensure: 'absent'
-#  smtpd_tls_cert_file:
-#    value: '$smtp_tls_cert_file'
-#  smtpd_tls_key_file:
-#    value: '$smtp_tls_cert_file'
-#  smtpd_tls_loglevel:
-#    value: '1'
-#  smtpd_tls_received_header:
-#    value: 'yes'
-#  smtpd_tls_session_cache_database:
-#    value: 'btree:${data_directory}/smtpd_scache'
-#  smtpd_tls_session_cache_timeout:
-#    ensure: 'absent'
   tls_random_prng_update_period:
     ensure: 'absent'
   tls_random_source:
     ensure: 'absent'
-#  smtpd_use_tls:
-#    value: 'yes'
   transport_maps:
     value: 'hash:/etc/postfix/maps/discarded_domains hash:/etc/postfix/maps/transport ldap:/etc/postfix/ldap/mailhost.cf'
   unknown_local_recipient_reject_code: