From 9a040a426f0dc010e952d034d4b1a8f00587c4e5 Mon Sep 17 00:00:00 2001
From: Jared Davenport <jared@thegridsource.com>
Date: Wed, 23 Sep 2020 09:46:17 -0400
Subject: [PATCH] OpenDKIM support

---
 manifests/params.pp       | 15 +++++++++++++++
 manifests/server.pp       |  6 ++++++
 templates/main.cf-el8.erb |  9 +++++++++
 templates/main.cf.erb     |  9 +++++++++
 4 files changed, 39 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index ced4375..a8ee0c6 100644
--- 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
index 9be7e4f..61e39d0 100644
--- 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
index 2410b25..50aea24 100644
--- 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 -%>
\ No newline at end of file
diff --git a/templates/main.cf.erb b/templates/main.cf.erb
index 2e0beb0..472c3d3 100644
--- 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 -%>
\ No newline at end of file