commit 15e93bb17a4f8fea5da407579e914c70ca677839
author cml <cml@meep.table2.com> Tue May 16 09:53:30 2023 -0700
committer cml <cml@meep.table2.com> Tue May 16 09:53:30 2023 -0700
tree ff9513971e6f1ab08034068e9294cb5f1a4702f9
parent 52846b8427d2b9422014f5696768cf6e6c0976a8
parent ef23936377bd5d99d6da9ef656765d18ed8ffcb5

Merge branch 'smtpd_tls'

manifests/server.pp

diff --git a/manifests/server.pp b/manifests/server.pp
index bd6ac42..2d705c3 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -59,6 +59,9 @@
   $smtpd_end_of_data_restrictions = [],
   $smtpd_delay_reject = false,
   $ssl = false,
+  $smtpd_tls_loglevel = 1,
+  $smtpd_tls_security_level = undef,
+  $smtpd_tls_received_header = undef,
   $smtpd_tls_key_file = undef,
   $smtpd_tls_cert_file = undef,
   $smtpd_tls_CAfile = undef,
@@ -72,6 +75,7 @@
   $smtp_tls_CApath = undef,
   $smtp_tls_key_file = undef,
   $smtp_tls_cert_file = undef,
+  $smtp_tls_loglevel = 1,
   $smtp_tls_security_level = undef,
   $smtp_tls_secure_cert_match = undef,
   $smtp_tls_note_starttls_offer = false,
@@ -165,15 +169,6 @@
   $asf_mx_content_filter    = '',
   $max_postfix_amavis_procs = '10',
   $max_use_postfix_amavis   = '25',
-  ## ASF Custom Logrotate Variables
-  $postfix_logrotate_path          = '/var/log/mail.log',
-  $postfix_logrotate_rotate        = 7,
-  $postfix_logrotate_rotate_every  = 'day',
-  $postfix_logrotate_compress      = true,
-  $postfix_logrotate_delaycompress = true,
-  $postfix_logrotate_missingok     = true,
-  $postfix_logrotate_sharedscripts = false,
-  $postfix_logrotate_postrotate    = "service rsyslog rotate"
   
 ) inherits ::postfix::params {
 
@@ -258,6 +253,7 @@
   postfix::file { 'header_checks':
     content    => template('postfix/header_checks.erb'),
     group      => $root_group,
+    notify     => Service['postfix'],
     postfixdir => $config_directory,
   }
 
@@ -265,19 +261,12 @@
   postfix::file { 'body_checks':
     content    => template('postfix/body_checks.erb'),
     group      => $root_group,
+    notify     => Service['postfix'],
     postfixdir => $config_directory,
   }
 
   logrotate::rule { 'postfix':
-    path          => $postfix_logrotate_path,
-    rotate        => $postfix_logrotate_rotate,
-    rotate_every  => $postfix_logrotate_rotate_every,
-    compress      => $postfix_logrotate_compress,
-    delaycompress => $postfix_logrotate_delaycompress,
-    missingok     => $postfix_logrotate_missingok,
-    sharedscripts => $postfix_logrotate_sharedscripts,
-    postrotate    => $postfix_logrotate_postrotate,
+    ensure => absent,
   }
 
 }
-

templates/main.cf.erb

diff --git a/templates/main.cf.erb b/templates/main.cf.erb
index 7722ff1..9b5caea 100644
--- a/templates/main.cf.erb
+++ b/templates/main.cf.erb
@@ -741,7 +741,13 @@
 <% if @ssl -%>
 # TLS stuff
 smtpd_use_tls = yes
-smtpd_tls_loglevel = 1
+smtpd_tls_loglevel = <%= @smtpd_tls_loglevel %>
+<% if @smtpd_tls_security_level -%>
+smtpd_tls_security_level = <%= @smtpd_tls_security_level %>
+<% end -%>
+<% if @smtpd_tls_received_header -%>
+smtpd_tls_received_header = <%= @smtpd_tls_received_header %>
+<% end -%>
 <% if @smtpd_tls_key_file -%>
 smtpd_tls_key_file = <%= @smtpd_tls_key_file %>
 <% else -%>
@@ -783,6 +789,7 @@
 <% end -%>
 <% if @smtp_sasl_tls or @smtp_use_tls -%>
 smtp_use_tls = yes
+smtp_tls_loglevel = <%= @smtp_tls_loglevel %>
 <% if @smtp_tls_CAfile -%>
 smtp_tls_CAfile = <%= @smtp_tls_CAfile %>
 <% end -%>