From bbed9ba7ff0164895cebd635ba485888591730b3 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 1 Jun 2017 13:30:14 +0200
Subject: [PATCH] Removing unnecessary variables from new Postfix configuration

---
 .../pixelpark/racktables.pixelpark.com.yaml   | 21 ++------
 .../pixelpark/test-mail02.pixelpark.net.yaml  | 49 +++----------------
 2 files changed, 9 insertions(+), 61 deletions(-)

diff --git a/customer/pixelpark/racktables.pixelpark.com.yaml b/customer/pixelpark/racktables.pixelpark.com.yaml
index 79706120..a6c9f8b2 100644
--- a/customer/pixelpark/racktables.pixelpark.com.yaml
+++ b/customer/pixelpark/racktables.pixelpark.com.yaml
@@ -22,22 +22,7 @@ postfix::myorigin: "pixelpark.com"
 #infra::profile::postfix::has_default_generic: true
 
 # Main.cf config entries
-infra::profile::postfix::configs:
-  alias_database:
-    ensure: 'blank'
-#  mynetworks:
-#    value: "127.0.0.0/8"
-#  smtp_generic_maps:
-#    value: '${default_database_type}:${config_directory}/generic'
-#  virtual_alias_maps:
-#    value: '${default_database_type}:${config_directory}/virtual'
-
-# All postfix hash databases
-#infra::profile::postfix::hashes:
-#  '/etc/postfix/generic':
-#    ensure: 'present'
-#    content: "root        root+%{::fqdn}\n"
-#  '/etc/postfix/virtual':
-#    ensure: 'present'
-#    source: 'puppet:///postfix_dir/maps/virtual-nullclient'
+#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 0aa730e2..a255474b 100644
--- a/customer/pixelpark/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark/test-mail02.pixelpark.net.yaml
@@ -103,22 +103,16 @@ ldap_bind_pw: >
 
 # Main.cf config entries
 infra::profile::postfix::configs:
-  alias_database:
-    value: 'hash:/etc/postfix/maps/aliases'
+#  alias_database:
+#    value: 'hash:/etc/postfix/maps/aliases'
   masquerade_domains:
     value: 'hash:/etc/postfix/maps/masquerade_domains'
-#  mynetworks:
-#    value: 'cidr:/etc/postfix/maps/my-networks'
   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:
     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'
-#  virtual_alias_maps:
-#    value: 'pcre:/etc/postfix/maps/virtual-regex hash:/etc/postfix/maps/virtual-aliases'
 
 # All postfix hash databases
 infra::profile::postfix::hashes:
@@ -131,9 +125,6 @@ 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/masquerade_domains':
     ensure: 'present'
     source: 'puppet:///postfix_dir/maps/masquerade_domains'
@@ -143,50 +134,22 @@ infra::profile::postfix::hashes:
   '/etc/postfix/maps/smtp-tls-peers':
     ensure: 'present'
     source: 'puppet:///postfix_dir/maps/smtp-tls-peers'
-#  '/etc/postfix/maps/transport':
-#    ensure: 'present'
-#    source: 'puppet:///postfix_dir/maps/transport'
   '/etc/postfix/maps/canonical-recipients':
     ensure: 'present'
     source: 'puppet:///postfix_dir/maps/canonical-recipients'
-#  '/etc/postfix/maps/virtual-aliases':
-#    ensure: 'present'
-#    source: 'puppet:///postfix_dir/maps/virtual-aliases'
 
 # All other postfix configuration files
 infra::profile::postfix::conffiles:
-#  my-networks:
-#    ensure: 'present'
-#    path: '/etc/postfix/maps/my-networks'
-#    source: 'puppet:///postfix_dir/maps/my-networks'
-#  virtual-regex:
-#    ensure: 'present'
-#    path: '/etc/postfix/maps/virtual-regex'
-#    source: 'puppet:///postfix_dir/maps/virtual-regex'
-  ldap-alias:
-    ensure: 'present'
-    path: '/etc/postfix/ldap/alias.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'
-      bind: 'yes'
-      bind_dn: "%{hiera('ldap_bind_dn')}"
-      bind_pw: "%{hiera('ldap_bind_pw')}"
-#  ldap-mailhost:
+#  ldap-alias:
 #    ensure: 'present'
-#    path: '/etc/postfix/ldap/mailhost.cf'
+#    path: '/etc/postfix/ldap/alias.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]'
+#      query_filter: '(mailAlternateAddress=%u@pixelpark.com)'
+#      result_attribute: 'mail'
 #      bind: 'yes'
 #      bind_dn: "%{hiera('ldap_bind_dn')}"
 #      bind_pw: "%{hiera('ldap_bind_pw')}"
-- 
2.39.5