From 9591f834820377be3b5dcd839cc1748cc9bf2e25 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 1 Jun 2017 11:12:38 +0200
Subject: [PATCH] Removing many unnecessary variables from new Postfix
 configuration

---
 .../pixelpark/racktables.pixelpark.com.yaml    | 10 +++++-----
 .../pixelpark/test-mail02.pixelpark.net.yaml   | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/customer/pixelpark/racktables.pixelpark.com.yaml b/customer/pixelpark/racktables.pixelpark.com.yaml
index b363f5a0..dc744714 100644
--- a/customer/pixelpark/racktables.pixelpark.com.yaml
+++ b/customer/pixelpark/racktables.pixelpark.com.yaml
@@ -28,15 +28,15 @@ infra::profile::postfix::configs:
     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'
+#  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'
+#  '/etc/postfix/virtual':
+#    ensure: 'present'
+#    source: 'puppet:///postfix_dir/maps/virtual-nullclient'
 
diff --git a/customer/pixelpark/test-mail02.pixelpark.net.yaml b/customer/pixelpark/test-mail02.pixelpark.net.yaml
index 284f8cf5..80cd9abb 100644
--- a/customer/pixelpark/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark/test-mail02.pixelpark.net.yaml
@@ -116,8 +116,8 @@ infra::profile::postfix::configs:
     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'
+#  virtual_alias_maps:
+#    value: 'pcre:/etc/postfix/maps/virtual-regex hash:/etc/postfix/maps/virtual-aliases'
 
 # All postfix hash databases
 infra::profile::postfix::hashes:
@@ -142,9 +142,9 @@ 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/transport':
+#    ensure: 'present'
+#    source: 'puppet:///postfix_dir/maps/transport'
   '/etc/postfix/maps/canonical-recipients':
     ensure: 'present'
     source: 'puppet:///postfix_dir/maps/canonical-recipients'
@@ -158,10 +158,10 @@ infra::profile::postfix::conffiles:
     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'
+#  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'
-- 
2.39.5