Removing many unnecessary variables from new Postfix configuration

diff --git a/customer/pixelpark/racktables.pixelpark.com.yaml b/customer/pixelpark/racktables.pixelpark.com.yaml
index 8085a67f643b7186de6f177c3c7e9ea5c482c0ee..0ddd328d6a908939b40a4a0ce7ced7ec2c292586 100644 (file)
--- a/customer/pixelpark/racktables.pixelpark.com.yaml
+++ b/customer/pixelpark/racktables.pixelpark.com.yaml
@@ -14,57 +14,16 @@ postfix::manage_mailx: false
 postfix::mastercf_source: 'puppet:///postfix_dir/master-nullclient.cf'
 postfix::myorigin: "pixelpark.com"
 
-infra::profile::postfix::has_map_smtp_tls_peers: false
-infra::profile::postfix::tls: true
+#infra::profile::postfix::has_map_smtp_tls_peers: false
+#infra::profile::postfix::relayhost: '[mx.pixelpark.net]'
+#infra::profile::postfix::tls: true
 
 # Main.cf config entries
 infra::profile::postfix::configs:
-  address_verify_map:
-    ensure: 'absent'
   alias_database:
     ensure: 'blank'
-  append_dot_mydomain:
-    value: 'no'
-  biff:
-    value: 'no'
-  command_directory:
-    ensure: 'absent'
-  daemon_directory:
-    ensure: 'absent'
-  data_directory:
-    ensure: 'absent'
-  debug_peer_level:
-    ensure: 'absent'
-  debugger_command:
-    ensure: 'absent'
-  default_database_type:
-    value: 'hash'
-  html_directory:
-    ensure: 'absent'
-  inet_protocols:
-    value: 'all'
-  local_recipient_maps:
-    ensure: 'blank'
-  local_transport:
-    value: 'error:5.1.1 Mailbox unavailable'
-  mail_owner:
-    ensure: 'absent'
-  mailbox_size_limit:
-    value: '0'
-  manpage_directory:
-    ensure: 'absent'
-  master_service_disable:
-    value: 'inet'
-  mydestination:
-    ensure: 'blank'
-  mydomain:
-    value: 'pixelpark.com'
-  myhostname:
-    value: "%{::fqdn}"
   mynetworks:
     value: "127.0.0.0/8"
-  relayhost:
-    value: '[mx.pixelpark.net]'
   smtp_generic_maps:
     value: '${default_database_type}:${config_directory}/generic'
   virtual_alias_maps:

diff --git a/customer/pixelpark/test-mail02.pixelpark.net.yaml b/customer/pixelpark/test-mail02.pixelpark.net.yaml
index 1ef9e277c6b44eb583721cda1b6c0bd25b6eec05..5617912c6fa41731e24bf8d47c7e5f4901dae9d7 100644 (file)
--- a/customer/pixelpark/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark/test-mail02.pixelpark.net.yaml
@@ -58,7 +58,9 @@ infra::profile::sasl::application:
 infra::profile::postfix::aliases_file: '/etc/postfix/maps/aliases'
 infra::profile::postfix::aliases_source: 'puppet:///postfix_dir/maps/aliases'
 infra::profile::postfix::has_map_smtp_tls_peers: true
+#infra::profile::postfix::relayhost: ''
 infra::profile::postfix::tls: true
+infra::profile::postfix::is_relay: true
 
 ldap_server: 'ldap.pixelpark.com'
 ldap_port: '389'
@@ -84,104 +86,20 @@ postfix::myorigin: 'pixelpark.com'
 
 # Main.cf config entries
 infra::profile::postfix::configs:
-  address_verify_map:
-    ensure: 'absent'
   alias_database:
     value: 'hash:/etc/postfix/maps/aliases'
-  append_dot_mydomain:
-    value: 'no'
-  biff:
-    value: 'no'
-  broken_sasl_auth_clients:
-    value: 'yes'
-  command_directory:
-    ensure: 'absent'
-  daemon_directory:
-    ensure: 'absent'
-  data_directory:
-    ensure: 'absent'
-  debug_peer_level:
-    ensure: 'absent'
-  debugger_command:
-    ensure: 'absent'
-  hash_queue_depth:
-    value: '3'
-  html_directory:
-    ensure: 'absent'
-  inet_protocols:
-    value: 'all'
-  lmtp_tls_loglevel:
-    value: '1'
-  mail_owner:
-    ensure: 'absent'
-  mailbox_size_limit:
-    value: '0'
-  manpage_directory:
-    ensure: 'absent'
   masquerade_domains:
     value: 'hash:/etc/postfix/maps/masquerade_domains'
-  maximal_queue_lifetime:
-    value: '10d'
-  message_size_limit:
-    value: '358400000'
-  mydestination:
-    value: '$myhostname, localhost.$mydomain, localhost'
-  mydomain:
-    value: 'pixelpark.com'
-  myhostname:
-    value: "%{::fqdn}"
   mynetworks:
     value: 'cidr:/etc/postfix/maps/my-networks'
-  queue_directory:
-    ensure: 'absent'
-  readme_directory:
-    value: '/usr/share/doc/postfix'
   recipient_canonical_maps:
     value: 'hash:/etc/postfix/maps/canonical-recipients ldap:/etc/postfix/ldap/mailroutingaddress.cf'
-  recipient_delimiter:
-    value: '+'
   relay_domains:
     value: 'hash:/etc/postfix/maps/relay_domains'
-  relayhost:
-    ensure: 'blank'
-  sample_directory:
-    ensure: 'absent'
-  sender_dependent_default_transport_maps:
-    ensure: 'absent'
-  sender_dependent_relayhost_maps:
-   ensure: 'absent'
-  setgid_group:
-    ensure: 'absent'
-  smtp_generic_maps:
-    ensure: 'absent'
-  smtp_sasl_auth_enable:
-    ensure: 'absent'
-  smtpd_banner:
-    value: '$myhostname ESMTP $mail_name $mail_version'
-  smtpd_client_restrictions:
-    ensure: 'absent'
-  smtpd_recipient_restrictions:
-    ensure: 'absent'
   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"
-  smtpd_sasl_auth_enable:
-    value: 'yes'
-  smtpd_sasl_authenticated_header:
-    value: 'yes'
-  smtpd_sasl_local_domain:
-    ensure: 'absent'
-  smtpd_sender_restrictions:
-    ensure: 'absent'
-  tls_random_prng_update_period:
-    ensure: 'absent'
-  tls_random_source:
-    ensure: 'absent'
   transport_maps:
     value: 'hash:/etc/postfix/maps/discarded_domains hash:/etc/postfix/maps/transport ldap:/etc/postfix/ldap/mailhost.cf'
-  unknown_local_recipient_reject_code:
-    ensure: 'absent'
-  unverified_recipient_reject_code:
-    value: '550'
   virtual_alias_maps:
     value: 'pcre:/etc/postfix/maps/virtual-regex hash:/etc/postfix/maps/virtual-aliases'