Removing many unnecessary variables from new Postfix configuration

diff --git a/customer/pixelpark/racktables.pixelpark.com.yaml b/customer/pixelpark/racktables.pixelpark.com.yaml
index 0ddd328d6a908939b40a4a0ce7ced7ec2c292586..b363f5a0ae7192cb6cdf1a71bc7eb6d9f59a9923 100644 (file)
--- a/customer/pixelpark/racktables.pixelpark.com.yaml
+++ b/customer/pixelpark/racktables.pixelpark.com.yaml
@@ -18,6 +18,8 @@ postfix::myorigin: "pixelpark.com"
 #infra::profile::postfix::relayhost: '[mx.pixelpark.net]'
 #infra::profile::postfix::tls: true
 
+infra::profile::postfix::transport_maps_source: 'maps/transport-fbb'
+
 # Main.cf config entries
 infra::profile::postfix::configs:
   alias_database:

diff --git a/customer/pixelpark/test-mail02.pixelpark.net.yaml b/customer/pixelpark/test-mail02.pixelpark.net.yaml
index 5617912c6fa41731e24bf8d47c7e5f4901dae9d7..4da6924a3b95fbddba1481784d9025ab58e3af16 100644 (file)
--- a/customer/pixelpark/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark/test-mail02.pixelpark.net.yaml
@@ -55,6 +55,12 @@ infra::profile::sasl::application:
 # Postfix configuration:
 
 # Global configurations
+postfix::alias_maps: "hash:/etc/postfix/maps/aliases ldap:/etc/postfix/ldap/alias.cf"
+postfix::inet_interfaces: 'all'
+postfix::manage_mailx: false
+postfix::mastercf_source: 'puppet:///postfix_dir/master.cf'
+postfix::myorigin: 'pixelpark.com'
+
 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
@@ -62,6 +68,22 @@ infra::profile::postfix::has_map_smtp_tls_peers: true
 infra::profile::postfix::tls: true
 infra::profile::postfix::is_relay: true
 
+#infra::profile::postfix::ldap_server: 'ldap.pixelpark.com'
+#infra::profile::postfix::ldap_port: '389'
+#infra::profile::postfix::ldap_timeout: '5'
+#infra::profile::postfix::ldap_search_base: 'o=isp'
+#infra::profile::postfix::ldap_bind_dn: 'cn=admin'
+infra::profile::postfix::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'
@@ -78,12 +100,6 @@ ldap_bind_pw: >
     EPXIdDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD/aCWYpB6KwUIcLp1T
     EKskgBArkfXhMZNEUfrTvFILs4Ig]
 
-postfix::alias_maps: "hash:/etc/postfix/maps/aliases ldap:/etc/postfix/ldap/alias.cf"
-postfix::inet_interfaces: 'all'
-postfix::manage_mailx: false
-postfix::mastercf_source: 'puppet:///postfix_dir/master.cf'
-postfix::myorigin: 'pixelpark.com'
-
 # Main.cf config entries
 infra::profile::postfix::configs:
   alias_database:
@@ -98,8 +114,8 @@ infra::profile::postfix::configs:
     value: 'hash:/etc/postfix/maps/relay_domains'
   smtpd_relay_restrictions:
     value: "check_client_access hash:/etc/postfix/maps/access_client, check_recipient_access hash:/etc/postfix/maps/access_recipient, check_sender_access hash:/etc/postfix/maps/access_sender, reject_non_fqdn_recipient, reject_non_fqdn_sender, reject_invalid_helo_hostname, permit_mynetworks, permit_sasl_authenticated, permit_tls_clientcerts, reject_unauth_destination, reject_unauth_destination, reject_unverified_recipient, permit"
-  transport_maps:
-    value: 'hash:/etc/postfix/maps/discarded_domains hash:/etc/postfix/maps/transport ldap:/etc/postfix/ldap/mailhost.cf'
+#  transport_maps:
+#    value: 'hash:/etc/postfix/maps/discarded_domains hash:/etc/postfix/maps/transport ldap:/etc/postfix/ldap/mailhost.cf'
   virtual_alias_maps:
     value: 'pcre:/etc/postfix/maps/virtual-regex hash:/etc/postfix/maps/virtual-aliases'
 
@@ -114,9 +130,9 @@ infra::profile::postfix::hashes:
   '/etc/postfix/maps/access_sender':
     ensure: 'present'
     source: 'puppet:///postfix_dir/maps/access_sender'
-  '/etc/postfix/maps/discarded_domains':
-    ensure: 'present'
-    source: 'puppet:///postfix_dir/maps/discarded_domains'
+#  '/etc/postfix/maps/discarded_domains':
+#    ensure: 'present'
+#    source: 'puppet:///postfix_dir/maps/discarded_domains'
   '/etc/postfix/maps/masquerade_domains':
     ensure: 'present'
     source: 'puppet:///postfix_dir/maps/masquerade_domains'
@@ -159,20 +175,20 @@ infra::profile::postfix::conffiles:
       bind: 'yes'
       bind_dn: "%{hiera('ldap_bind_dn')}"
       bind_pw: "%{hiera('ldap_bind_pw')}"
-  ldap-mailhost:
-    ensure: 'present'
-    path: '/etc/postfix/ldap/mailhost.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: 'mailhost'
-      result_format: 'smtp:[%s]'
-      bind: 'yes'
-      bind_dn: "%{hiera('ldap_bind_dn')}"
-      bind_pw: "%{hiera('ldap_bind_pw')}"
+#  ldap-mailhost:
+#    ensure: 'present'
+#    path: '/etc/postfix/ldap/mailhost.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: 'mailhost'
+#      result_format: 'smtp:[%s]'
+#      bind: 'yes'
+#      bind_dn: "%{hiera('ldap_bind_dn')}"
+#      bind_pw: "%{hiera('ldap_bind_pw')}"
   ldap-mailroutingaddress:
     ensure: 'present'
     path: '/etc/postfix/ldap/mailroutingaddress.cf'