Change default mode and location when merging key #31 (#37)

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Release 2.5.0 (July 27, 2018)
+
+### Summary
+* Change mode and location of resulting file when `merge_key` is set to true #31
+
 ## Release 2.4.0 (July 26, 2018)
 
 ### Summary

manifests/site.pp

@@ -353,15 +353,24 @@
     mode   => $key_dir_mode,
   })
 
+  if ($merge_key) {
+    $substring_mode = $cert_mode[0,-3]
+    $_cert_mode = "${substring_mode}00"
+    $_cert_path = $key_path
+  } else {
+    $_cert_mode = $cert_mode
+    $_cert_path = $cert_path
+  }
+
   if ($merge_chain or $merge_key or $merge_dhparam) {
     concat { "${name}_cert_merged":
         ensure         => $ensure,
         ensure_newline => true,
         backup         => false,
-        path           => "${cert_path}/${cert}",
+        path           => "${_cert_path}/${cert}",
         owner          => $owner,
         group          => $group,
-        mode           => $cert_mode,
+        mode           => $_cert_mode,
         require        => File[$cert_path],
         notify         => $service_notify,
     }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "broadinstitute-certs",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "author": "Riccardo Calixte <rcalixte@broadinstitute.org>",
   "description": "Module for SSL certificate configuration",
   "summary": "Configures and manages SSL certificate deployments, restarting services as configured.",