fbb cleanup up common yaml

diff --git a/customer/fbb-db/common.yaml b/customer/fbb-db/common.yaml
index 4833630f72d2489ed1c984975ee091414e3ec580..4426863e15708792870bd2f093b3a44a77dcdbe8 100644 (file)
--- a/customer/fbb-db/common.yaml
+++ b/customer/fbb-db/common.yaml
@@ -2,7 +2,7 @@
 #####################################################
 # Postfix configuration:
 
-# Global configurations 
+# Global configurations
 postfix::alias_maps: "hash:/etc/aliases"
 postfix::inet_interfaces: 'all'
 postfix::manage_mailx: false
@@ -10,39 +10,6 @@ postfix::mastercf_source: 'puppet:///postfix_dir/master-nullclient.cf'
 postfix::myorigin: "pixelpark.net"
 
 # Default values for PP Postfix module
-#infra::profile::postfix::config_directory: '/etc/postfix'
-#infra::profile::postfix::aliases_file: ~
-#infra::profile::postfix::aliases_source: ~
 infra::profile::postfix::myorigin: "%{hiera('postfix::myorigin')}"
-#infra::profile::postfix::relayhost: '[mx.pixelpark.net]'
-#infra::profile::postfix::tls: true
-#infra::profile::postfix::tls_cert: ~
-#infra::profile::postfix::tls_key: ~
-#infra::profile::postfix::tls_chain: ~
-#infra::profile::postfix::tls_loglevel: 1
-#infra::profile::postfix::tls_received_header: true
-#infra::profile::postfix::tls_security_level: 'may'
-#infra::profile::postfix::tls_auth_only: false
-#infra::profile::postfix::cert_servername: 'wildcard.pixelpark.com'
-#infra::profile::postfix::cert_customer: ~
-
-#infra::profile::postfix::has_map_smtp_tls_peers: false
-#infra::profile::postfix::map_smtp_tls_peers: '/etc/postfix/maps/smtp-tls-peers'
-
-#infra::profile::postfix::is_relay: false
-#infra::profile::postfix::unverified_recipient_reject_code: '550'
-#infra::profile::postfix::transport_maps_source: ~
 infra::profile::postfix::transport_maps_source: 'maps/transport-fbb'
-#infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient'
 infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient-fbb'
-#infra::profile::postfix::has_default_generic: 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: 'n/a'
-
-#infra::profile::postfix::has_map_smtp_tls_peers: false
-#infra::profile::postfix::relayhost: '[mx.pixelpark.net]'

diff --git a/customer/fbb-ws/common.yaml b/customer/fbb-ws/common.yaml
index 4833630f72d2489ed1c984975ee091414e3ec580..4426863e15708792870bd2f093b3a44a77dcdbe8 100644 (file)
--- a/customer/fbb-ws/common.yaml
+++ b/customer/fbb-ws/common.yaml
@@ -2,7 +2,7 @@
 #####################################################
 # Postfix configuration:
 
-# Global configurations 
+# Global configurations
 postfix::alias_maps: "hash:/etc/aliases"
 postfix::inet_interfaces: 'all'
 postfix::manage_mailx: false
@@ -10,39 +10,6 @@ postfix::mastercf_source: 'puppet:///postfix_dir/master-nullclient.cf'
 postfix::myorigin: "pixelpark.net"
 
 # Default values for PP Postfix module
-#infra::profile::postfix::config_directory: '/etc/postfix'
-#infra::profile::postfix::aliases_file: ~
-#infra::profile::postfix::aliases_source: ~
 infra::profile::postfix::myorigin: "%{hiera('postfix::myorigin')}"
-#infra::profile::postfix::relayhost: '[mx.pixelpark.net]'
-#infra::profile::postfix::tls: true
-#infra::profile::postfix::tls_cert: ~
-#infra::profile::postfix::tls_key: ~
-#infra::profile::postfix::tls_chain: ~
-#infra::profile::postfix::tls_loglevel: 1
-#infra::profile::postfix::tls_received_header: true
-#infra::profile::postfix::tls_security_level: 'may'
-#infra::profile::postfix::tls_auth_only: false
-#infra::profile::postfix::cert_servername: 'wildcard.pixelpark.com'
-#infra::profile::postfix::cert_customer: ~
-
-#infra::profile::postfix::has_map_smtp_tls_peers: false
-#infra::profile::postfix::map_smtp_tls_peers: '/etc/postfix/maps/smtp-tls-peers'
-
-#infra::profile::postfix::is_relay: false
-#infra::profile::postfix::unverified_recipient_reject_code: '550'
-#infra::profile::postfix::transport_maps_source: ~
 infra::profile::postfix::transport_maps_source: 'maps/transport-fbb'
-#infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient'
 infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient-fbb'
-#infra::profile::postfix::has_default_generic: 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: 'n/a'
-
-#infra::profile::postfix::has_map_smtp_tls_peers: false
-#infra::profile::postfix::relayhost: '[mx.pixelpark.net]'

diff --git a/customer/fbb-www/common.yaml b/customer/fbb-www/common.yaml
index 4833630f72d2489ed1c984975ee091414e3ec580..4426863e15708792870bd2f093b3a44a77dcdbe8 100644 (file)
--- a/customer/fbb-www/common.yaml
+++ b/customer/fbb-www/common.yaml
@@ -2,7 +2,7 @@
 #####################################################
 # Postfix configuration:
 
-# Global configurations 
+# Global configurations
 postfix::alias_maps: "hash:/etc/aliases"
 postfix::inet_interfaces: 'all'
 postfix::manage_mailx: false
@@ -10,39 +10,6 @@ postfix::mastercf_source: 'puppet:///postfix_dir/master-nullclient.cf'
 postfix::myorigin: "pixelpark.net"
 
 # Default values for PP Postfix module
-#infra::profile::postfix::config_directory: '/etc/postfix'
-#infra::profile::postfix::aliases_file: ~
-#infra::profile::postfix::aliases_source: ~
 infra::profile::postfix::myorigin: "%{hiera('postfix::myorigin')}"
-#infra::profile::postfix::relayhost: '[mx.pixelpark.net]'
-#infra::profile::postfix::tls: true
-#infra::profile::postfix::tls_cert: ~
-#infra::profile::postfix::tls_key: ~
-#infra::profile::postfix::tls_chain: ~
-#infra::profile::postfix::tls_loglevel: 1
-#infra::profile::postfix::tls_received_header: true
-#infra::profile::postfix::tls_security_level: 'may'
-#infra::profile::postfix::tls_auth_only: false
-#infra::profile::postfix::cert_servername: 'wildcard.pixelpark.com'
-#infra::profile::postfix::cert_customer: ~
-
-#infra::profile::postfix::has_map_smtp_tls_peers: false
-#infra::profile::postfix::map_smtp_tls_peers: '/etc/postfix/maps/smtp-tls-peers'
-
-#infra::profile::postfix::is_relay: false
-#infra::profile::postfix::unverified_recipient_reject_code: '550'
-#infra::profile::postfix::transport_maps_source: ~
 infra::profile::postfix::transport_maps_source: 'maps/transport-fbb'
-#infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient'
 infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient-fbb'
-#infra::profile::postfix::has_default_generic: 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: 'n/a'
-
-#infra::profile::postfix::has_map_smtp_tls_peers: false
-#infra::profile::postfix::relayhost: '[mx.pixelpark.net]'