From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 1 Jun 2017 10:03:37 +0000 (+0200)
Subject: Removing unnecessary variables from new Postfix configuration
X-Git-Tag: v0.1.0~2866^2~1
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=1072ff387a9bd4552a2c76c9395e6dca27139cab;p=pixelpark%2Fhiera.git

Removing unnecessary variables from new Postfix configuration
---

diff --git a/customer/pixelpark/racktables.pixelpark.com.yaml b/customer/pixelpark/racktables.pixelpark.com.yaml
index b627c7d3..79706120 100644
--- a/customer/pixelpark/racktables.pixelpark.com.yaml
+++ b/customer/pixelpark/racktables.pixelpark.com.yaml
@@ -19,23 +19,24 @@ postfix::myorigin: "pixelpark.com"
 #infra::profile::postfix::tls: true
 
 #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'
-  mynetworks:
-    value: "127.0.0.0/8"
-  smtp_generic_maps:
-    value: '${default_database_type}:${config_directory}/generic'
+#  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"
+#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'
diff --git a/customer/pixelpark/test-mail02.pixelpark.net.yaml b/customer/pixelpark/test-mail02.pixelpark.net.yaml
index 80cd9abb..0aa730e2 100644
--- a/customer/pixelpark/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark/test-mail02.pixelpark.net.yaml
@@ -67,6 +67,7 @@ infra::profile::postfix::has_map_smtp_tls_peers: true
 #infra::profile::postfix::relayhost: ''
 infra::profile::postfix::tls: true
 infra::profile::postfix::is_relay: true
+infra::profile::postfix::has_default_generic: false
 
 #infra::profile::postfix::ldap_server: 'ldap.pixelpark.com'
 #infra::profile::postfix::ldap_port: '389'
@@ -106,8 +107,8 @@ infra::profile::postfix::configs:
     value: 'hash:/etc/postfix/maps/aliases'
   masquerade_domains:
     value: 'hash:/etc/postfix/maps/masquerade_domains'
-  mynetworks:
-    value: 'cidr:/etc/postfix/maps/my-networks'
+#  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:
@@ -154,10 +155,10 @@ infra::profile::postfix::hashes:
 
 # 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'
+#  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'