Solve #23 - Generic config line support

lvicainne · May 27, 2022 · b5a3ae8 · b5a3ae8
1 parent 121f577
commit b5a3ae8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -32,6 +32,8 @@
   Optional[String]          $selector             = $opendkim::params::selector,
   Optional[String]          $publickey            = $opendkim::params::publickey,
   Optional[String]          $privatekey           = $opendkim::params::privatekey,
+  Optional[String]          $signaturealgorithm   = $opendkim::params::signaturealgorithm,
+  Optional[Integer]         $minimumkeybits       = $opendkim::params::minimumkeybits,
 
   Array[Struct[{
     domain         => String,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -22,6 +22,8 @@
   $selector = undef
   $publickey = undef
   $privatekey = undef
+  $signaturealgorithm = undef
+  $minimumkeybits = undef
 
   $keys = []
   $nameservers       = undef

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "lvicainne-opendkim",
-    "version": "0.2.9",
+    "version": "0.3.0",
     "author": "lvicainne",
     "license": "Apache-2.0",
     "summary": "Manage an OpenDKIM configuration",
@@ -15,23 +15,28 @@
             "operatingsystemrelease": [
                 "5",
                 "6",
-                "7"
+                "7",
+                "8",
+                "9"
             ]
         },
         {
             "operatingsystem": "CentOS",
             "operatingsystemrelease": [
                 "5",
                 "6",
-                "7"
+                "7",
+                "8",
+                "9"
             ]
         },
         {
             "operatingsystem": "Debian",
             "operatingsystemrelease": [
                 "6",
                 "7",
-                "8"
+                "8",
+                "9"
             ]
         },
         {

diff --git a/templates/etc/opendkim.conf.erb b/templates/etc/opendkim.conf.erb
@@ -114,9 +114,18 @@ MaximumSignedBytes <%= @maximum_signed_bytes %>
 <% end -%>
 
 <% if @trustanchorfile -%>
-TrustAnchorFile         <%= @trustanchorfile %>
-<% end -%>
+TrustAnchorFile        <%= @trustanchorfile %>
 
+<% end -%>
 <% if @senderheaders -%>
+
 SenderHeaders          <%= @senderheaders.join(',') %>
 <% end -%>
+<% if @signaturealgorithm -%>
+SignatureAlgorithm     <%= @signaturealgorithm %>
+
+<% end -%>
+<% if @minimumkeybits -%>
+MinimumKeyBits         <%= @minimumkeybits %>
+
+<% end -%>