Removing unnecessary variables from new Postfix configuration

diff --git a/customer/pixelpark/racktables.pixelpark.com.yaml b/customer/pixelpark/racktables.pixelpark.com.yaml
index a6c9f8b2888e7cae6a6ee746ad4661f15b9d4b53..d6c3f121f8c5b0a65d26b18ee34a2335aff84f61 100644 (file)
--- a/customer/pixelpark/racktables.pixelpark.com.yaml
+++ b/customer/pixelpark/racktables.pixelpark.com.yaml
@@ -21,8 +21,3 @@ postfix::myorigin: "pixelpark.com"
 #infra::profile::postfix::transport_maps_source: 'maps/transport-fbb'
 #infra::profile::postfix::has_default_generic: true
 
-# Main.cf config entries
-#infra::profile::postfix::configs:
-#  alias_database:
-#    ensure: 'blank'
-

diff --git a/customer/pixelpark/test-mail02.pixelpark.net.yaml b/customer/pixelpark/test-mail02.pixelpark.net.yaml
index a255474b51d4643d20e1619d7851f2275f82f4bb..92365b39f4cf49cdd0bdbfb13c997ed21a414a47 100644 (file)
--- a/customer/pixelpark/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark/test-mail02.pixelpark.net.yaml
@@ -85,30 +85,28 @@ 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]
+#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:
-#  alias_database:
-#    value: 'hash:/etc/postfix/maps/aliases'
   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'
+#  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:
@@ -131,39 +129,26 @@ 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'
+#  '/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-alias:
+#infra::profile::postfix::conffiles:
+#  ldap-mailroutingaddress:
 #    ensure: 'present'
-#    path: '/etc/postfix/ldap/alias.cf'
+#    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: '(mailAlternateAddress=%u@pixelpark.com)'
-#      result_attribute: 'mail'
+#      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')}"
-  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')}"