Changing module infra::profile::postfix => pp_postfix

diff --git a/common.yaml b/common.yaml
index d4e2174c0c26a4cd9fef16aee7e75df7e18ae1f8..12a01ec01433c9d334bfd6557d1840f1aa53e9c0 100644 (file)
--- a/common.yaml
+++ b/common.yaml
@@ -17,6 +17,7 @@ sudo::purge: false
 
 postfix::myorigin: "pixelpark.net"
 infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient-webmaster'
+pp_postfix::virtual_aliases_source: 'maps/virtual-nullclient-webmaster'
 
 #####################################################
 # Rsyslog configuration

diff --git a/customer/pixelpark-mail-test/common.yaml b/customer/pixelpark-mail-test/common.yaml
index dcf383eb0e878b5a9fc135bf6b35bdd3e7f9dd09..b0ff6313e9e9b73d67a18827b1050a5b157453f3 100644 (file)
--- a/customer/pixelpark-mail-test/common.yaml
+++ b/customer/pixelpark-mail-test/common.yaml
@@ -1,7 +1,7 @@
 ---
 infra::additional_classes:
   - infra::profile::sasl
-  - infra::profile::postfix
+  - pp_postfix
 
 # Necessary, because the host has a local caching only DNS resolver
 #puppetconf::server: puppetmaster01.pixelpark.com
@@ -117,36 +117,36 @@ postfix::manage_mailx: false
 postfix::mastercf_source: 'puppet:///postfix_dir/master.cf'
 postfix::myorigin: 'pixelpark.com'
 
-#infra::profile::postfix::config_directory: '/etc/postfix'
-infra::profile::postfix::aliases_file: '/etc/postfix/maps/aliases'
-infra::profile::postfix::aliases_source: 'puppet:///postfix_dir/maps/aliases'
-#infra::profile::postfix::myorigin: "%{hiera('postfix::myorigin')}"
-#infra::profile::postfix::relayhost: ~
-#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: 'pixelpark'
-infra::profile::postfix::has_map_smtp_tls_peers: true
-#infra::profile::postfix::map_smtp_tls_peers: '/etc/postfix/maps/smtp-tls-peers'
-infra::profile::postfix::is_relay: true
-#infra::profile::postfix::unverified_recipient_reject_code: '550'
-#infra::profile::postfix::transport_maps_source: ~
-infra::profile::postfix::virtual_aliases_source: ~
-infra::profile::postfix::has_default_generic: false
-#infra::profile::postfix::virtual_regex: ~
-
-#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: >
+#pp_postfix::config_directory: '/etc/postfix'
+pp_postfix::aliases_file: '/etc/postfix/maps/aliases'
+pp_postfix::aliases_source: 'puppet:///postfix_dir/maps/aliases'
+#pp_postfix::myorigin: "%{hiera('postfix::myorigin')}"
+#pp_postfix::relayhost: ~
+#pp_postfix::tls: true
+#pp_postfix::tls_cert: ~
+#pp_postfix::tls_key: ~
+#pp_postfix::tls_chain: ~
+#pp_postfix::tls_loglevel: 1
+#pp_postfix::tls_received_header: true
+#pp_postfix::tls_security_level: 'may'
+#pp_postfix::tls_auth_only: false
+#pp_postfix::cert_servername: 'wildcard.pixelpark.com'
+#pp_postfix::cert_customer: 'pixelpark'
+pp_postfix::has_map_smtp_tls_peers: true
+#pp_postfix::map_smtp_tls_peers: '/etc/postfix/maps/smtp-tls-peers'
+pp_postfix::is_relay: true
+#pp_postfix::unverified_recipient_reject_code: '550'
+#pp_postfix::transport_maps_source: ~
+pp_postfix::virtual_aliases_source: ~
+pp_postfix::has_default_generic: false
+#pp_postfix::virtual_regex: ~
+
+#pp_postfix::ldap_server: 'ldap.pixelpark.com'
+#pp_postfix::ldap_port: '389'
+#pp_postfix::ldap_timeout: '5'
+#pp_postfix::ldap_search_base: 'o=isp'
+#pp_postfix::ldap_bind_dn: 'cn=admin'
+pp_postfix::ldap_bind_pw: >
     ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
     DQYJKoZIhvcNAQEBBQAEggEAkGouEnyjTBA40/lpw1BEHsDx2b2I3L2HHnm9
     U9gHYhz1BrPTsyCklW8CC3BiE0W9NRS0Rod+cm6M+7OMzciXbgQMFO6Ko98V