From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 1 Jun 2017 11:55:19 +0000 (+0200)
Subject: Removing old commented lines
X-Git-Tag: v0.1.0~2864^2~5
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a2dc0508b751f2d711d9b66fa7e156172459a7a9;p=pixelpark%2Fhiera.git

Removing old commented lines
---

diff --git a/customer/pixelpark/test-mail02.pixelpark.net.yaml b/customer/pixelpark/test-mail02.pixelpark.net.yaml
index 92365b39..75f5d8dd 100644
--- a/customer/pixelpark/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark/test-mail02.pixelpark.net.yaml
@@ -85,28 +85,10 @@ infra::profile::postfix::ldap_bind_pw: >
     EPXIdDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD/aCWYpB6KwUIcLp1T
     EKskgBArkfXhMZNEUfrTvFILs4Ig]
 
-#ldap_server: 'ldap.pixelpark.com'
-#ldap_port: '389'
-#ldap_timeout: '5'
-#ldap_search_base: 'o=isp'
-#ldap_bind_dn: 'cn=admin'
-#ldap_bind_pw: >
-#    ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
-#    DQYJKoZIhvcNAQEBBQAEggEAkGouEnyjTBA40/lpw1BEHsDx2b2I3L2HHnm9
-#    U9gHYhz1BrPTsyCklW8CC3BiE0W9NRS0Rod+cm6M+7OMzciXbgQMFO6Ko98V
-#    tzoTyL8yeWr4ZXNpov/gVD+WTfcKo2A0w+egenTdErN4dclnwzAoSR9QOHNT
-#    LUxHa6sTT191+79mjw0CnG1BwDKBnZRyO+fzgACFn0dUIasz7danBbZMPn/n
-#    wOuOrXXq/PVNPW9GSeKkbimYCAn7KDwTvJNTJCR7dh29+aq0xoSSsGrN+L+f
-#    OZrj3dG58D8lspbxNb4iFMswtOcihByp6n5fRmvnEFXw/Dn507UCTxURoLpp
-#    EPXIdDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD/aCWYpB6KwUIcLp1T
-#    EKskgBArkfXhMZNEUfrTvFILs4Ig]
-
 # Main.cf config entries
 infra::profile::postfix::configs:
   masquerade_domains:
     value: 'hash:/etc/postfix/maps/masquerade_domains'
-#  recipient_canonical_maps:
-#    value: 'hash:/etc/postfix/maps/canonical-recipients ldap:/etc/postfix/ldap/mailroutingaddress.cf'
   relay_domains:
     value: 'hash:/etc/postfix/maps/relay_domains'
   smtpd_relay_restrictions:
@@ -129,26 +111,4 @@ infra::profile::postfix::hashes:
   '/etc/postfix/maps/relay_domains':
     ensure: 'present'
     source: 'puppet:///postfix_dir/maps/relay_domains'
-#  '/etc/postfix/maps/smtp-tls-peers':
-#    ensure: 'present'
-#    source: 'puppet:///postfix_dir/maps/smtp-tls-peers'
-#  '/etc/postfix/maps/canonical-recipients':
-#    ensure: 'present'
-#    source: 'puppet:///postfix_dir/maps/canonical-recipients'
-
-# All other postfix configuration files
-#infra::profile::postfix::conffiles:
-#  ldap-mailroutingaddress:
-#    ensure: 'present'
-#    path: '/etc/postfix/ldap/mailroutingaddress.cf'
-#    options:
-#      server_host: "%{hiera('ldap_server')}"
-#      server_port: "%{hiera('ldap_port')}"
-#      timeout: "%{hiera('ldap_timeout')}"
-#      search_base: "%{hiera('ldap_search_base')}"
-#      query_filter: '(&(objectclass=inetLocalMailRecipient)(|(mail=%s)(mailAlternateAddress=%s)(mailEquivalentAddress=%s))(|(inetMailGroupStatus=active)(mailUserStatus=active)(mailUserStatus=hold)))'
-#      result_attribute: 'mailroutingaddress'
-#      bind: 'yes'
-#      bind_dn: "%{hiera('ldap_bind_dn')}"
-#      bind_pw: "%{hiera('ldap_bind_pw')}"