Removing all unnecessary variables from new Postfix configuration

diff --git a/customer/pixelpark/test-mail02.pixelpark.net.yaml b/customer/pixelpark/test-mail02.pixelpark.net.yaml
index f03f12e46270c98503173d77a7c2d23759af924d..d2729c2f967ff19e59f15313b6e37f013083dd0f 100644 (file)
--- a/customer/pixelpark/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark/test-mail02.pixelpark.net.yaml
@@ -86,29 +86,19 @@ infra::profile::postfix::ldap_bind_pw: >
     EKskgBArkfXhMZNEUfrTvFILs4Ig]
 
 # Main.cf config entries
-infra::profile::postfix::configs:
-#  masquerade_domains:
-#    value: 'hash:/etc/postfix/maps/masquerade_domains'
-#  relay_domains:
-#    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"
-
-# All postfix hash databases
-infra::profile::postfix::hashes:
-  '/etc/postfix/maps/access_client':
-    ensure: 'present'
-    source: 'puppet:///postfix_dir/maps/access_client'
-  '/etc/postfix/maps/access_recipient':
-    ensure: 'present'
-    source: 'puppet:///postfix_dir/maps/access_recipient'
-  '/etc/postfix/maps/access_sender':
-    ensure: 'present'
-    source: 'puppet:///postfix_dir/maps/access_sender'
-#  '/etc/postfix/maps/masquerade_domains':
+#infra::profile::postfix::configs:
+#  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"
+#
+## All postfix hash databases
+#infra::profile::postfix::hashes:
+#  '/etc/postfix/maps/access_client':
+#    ensure: 'present'
+#    source: 'puppet:///postfix_dir/maps/access_client'
+#  '/etc/postfix/maps/access_recipient':
 #    ensure: 'present'
-#    source: 'puppet:///postfix_dir/maps/masquerade_domains'
-#  '/etc/postfix/maps/relay_domains':
+#    source: 'puppet:///postfix_dir/maps/access_recipient'
+#  '/etc/postfix/maps/access_sender':
 #    ensure: 'present'
-#    source: 'puppet:///postfix_dir/maps/relay_domains'
+#    source: 'puppet:///postfix_dir/maps/access_sender'