4 files changed, 13 insertions, 3 deletions
diff --git a/puppet/modules/site_postfix/manifests/debug.pp b/puppet/modules/site_postfix/manifests/debug.pp
new file mode 100644
index 00000000..f370d166
--- /dev/null
+++ b/puppet/modules/site_postfix/manifests/debug.pp
@@ -0,0 +1,9 @@
+class site_postfix::debug {
+
+  postfix::config {
+    'debug_peer_list':      value => '127.0.0.1';
+    'debug_peer_level':     value => '1';
+    'smtpd_tls_loglevel':   value => '1';
+  }
+
+}
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp
index 0581f147..7e2082d9 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -17,13 +17,14 @@ class site_postfix::mx {
     'home_mailbox':         value => 'Maildir/';
     'virtual_alias_maps':   value => 'tcp:localhost:4242';
     'luser_relay':          value => 'vmail';
-    'local_recipient_maps': value => '';
-    'debug_peer_list':      value => '127.0.0.1';
   }
 
   include site_postfix::mx::smtpd_checks
   include site_postfix::mx::tls
 
+  # greater verbosity for debugging, take out for production
+  include site_postfix::debug
+
   user { 'vmail':
     ensure     => present,
     comment    => 'Leap Mailspool',
diff --git a/puppet/modules/site_postfix/manifests/mx/tls.pp b/puppet/modules/site_postfix/manifests/mx/tls.pp
index 4b7a2626..8c9da9db 100644
--- a/puppet/modules/site_postfix/manifests/mx/tls.pp
+++ b/puppet/modules/site_postfix/manifests/mx/tls.pp
@@ -23,7 +23,7 @@ class site_postfix::mx::tls {
     'smtpd_tls_CAfile':     value  => $client_ca;
     'smtpd_tls_cert_file':  value  => $cert_path;
     'smtpd_tls_key_file':   value  => $key_path;
-    'smtpd_tls_req_ccert':  value  => 'yes';
+    'smtpd_tls_ask_ccert':  value  => 'yes';
     'smtpd_tls_security_level':
       value  => 'may';
   }
diff --git a/puppet/modules/stdlib b/puppet/modules/stdlib
-Subproject 85470dfc1e703611a84abf922634d129dd2f8f8
+Subproject 73b69e8198f702f086ff6afd94a54dddc793589