OpenDKIM support

thias · Sep 23, 2020 · 9a040a4 · 9a040a4
1 parent 5da3b6f
commit 9a040a4
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 0 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -38,6 +38,11 @@
       $newaliases_path = '/usr/bin/newaliases.postfix'
       $sendmail_path = '/usr/sbin/sendmail.postfix'
       $postmap = '/usr/sbin/postmap'
+      $opendkim = false
+      $opendkim_milter_default_action = 'accept'
+      $opendkim_milter_protocol = '6'
+      $opendkim_smtpd_milters = 'local:opendkim/opendkim.sock'
+      $opendkim_non_smtpd_milters = 'local:opendkim/opendkim.sock'
     }
     'Debian': {
       $postfix_version = undef
@@ -65,6 +70,11 @@
       $newaliases_path = '/usr/bin/newaliases.postfix'
       $sendmail_path = '/usr/sbin/sendmail.postfix'
       $postmap = '/usr/sbin/postmap'
+      $opendkim = false
+      $opendkim_milter_default_action = 'accept'
+      $opendkim_milter_protocol = '6'
+      $opendkim_smtpd_milters = 'local:opendkim/opendkim.sock'
+      $opendkim_non_smtpd_milters = 'local:opendkim/opendkim.sock'
     }
     'FreeBSD': {
       $postfix_version = undef
@@ -92,6 +102,11 @@
       $newaliases_path = '/usr/local/bin/newaliases'
       $sendmail_path = '/usr/local/sbin/sendmail'
       $postmap = '/usr/local/sbin/postmap'
+      $opendkim = false
+      $opendkim_milter_default_action = 'accept'
+      $opendkim_milter_protocol = '6'
+      $opendkim_smtpd_milters = 'local:opendkim/opendkim.sock'
+      $opendkim_non_smtpd_milters = 'local:opendkim/opendkim.sock'
     }
     default: {
       fail("Unsupported OS family ${::osfamily}")

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -135,6 +135,12 @@
   $postgrey                = false,
   $postgrey_policy_service = undef,
   $clamav                  = false,
+  # OpenDKIM
+  $opendkim                        = $::postfix::params::opendkim,
+  $opendkim_milter_default_action  = $::postfix::params::opendkim_milter_default_action
+  $opendkim_milter_protocol        = $::postfix::params::opendkim_milter_protocol
+  $opendkim_smtpd_milters          = $::postfix::params::opendkim_smtpd_milters
+  $opendkim_non_smtpd_milters      = $::postfix::params::opendkim_non_smtpd_milters
   # Parameters
   $postfix_version        = $::postfix::params::postfix_version,
   $command_directory      = $::postfix::params::command_directory,

diff --git a/templates/main.cf-el8.erb b/templates/main.cf-el8.erb
@@ -1022,3 +1022,12 @@ postscreen_dnsbl_action = <%= @postscreen_dnsbl_action %>
 <% end -%>
 
 <% end -%>
+
+<%- if @opendkim -%>
+# Milter configuration
+# OpenDKIM
+milter_default_action = accept <%= @opendkim_milter_default_action %>
+milter_protocol = 6 <%= @opendkim_milter_protocol %>
+smtpd_milters = local:opendkim/opendkim.sock <%= @opendkim_smtpd_milters %>
+non_smtpd_milters = local:opendkim/opendkim.sock <%= @opendkim_non_smtpd_milters %>
+<%- end -%>
diff --git a/templates/main.cf.erb b/templates/main.cf.erb
@@ -970,3 +970,12 @@ postscreen_dnsbl_action = <%= @postscreen_dnsbl_action %>
 <% end -%>
 
 <% end -%>
+
+<%- if @opendkim -%>
+# Milter configuration
+# OpenDKIM
+milter_default_action = accept <%= @opendkim_milter_default_action %>
+milter_protocol = 6 <%= @opendkim_milter_protocol %>
+smtpd_milters = local:opendkim/opendkim.sock <%= @opendkim_smtpd_milters %>
+non_smtpd_milters = local:opendkim/opendkim.sock <%= @opendkim_non_smtpd_milters %>
+<%- end -%>