fix #622 Managing CA directory with known certificates

voxpupuli · Jul 6, 2020 · 3e3f8a7 · 3e3f8a7
1 parent 8703776
commit 3e3f8a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 68 deletions.
diff --git a/manifests/pki/ca.pp b/manifests/pki/ca.pp
@@ -34,10 +34,10 @@
   $group       = $::icinga2::globals::group
   $node_name   = $::icinga2::_constants['NodeName']
 
-  $_ssl_key_path    = "${::icinga2::globals::cert_dir}/${node_name}.key"
-  $_ssl_csr_path    = "${::icinga2::globals::cert_dir}/${node_name}.csr"
-  $_ssl_cert_path   = "${::icinga2::globals::cert_dir}/${node_name}.crt"
-  $_ssl_cacert_path = "${::icinga2::globals::cert_dir}/ca.crt"
+  $_ssl_key_path    = "${cert_dir}/${node_name}.key"
+  $_ssl_csr_path    = "${cert_dir}/${node_name}.csr"
+  $_ssl_cert_path   = "${cert_dir}/${node_name}.crt"
+  $_ssl_cacert_path = "${cert_dir}/ca.crt"
 
   File {
     owner => $user,
@@ -68,6 +68,10 @@
       $_ca_key      = $ca_key
     }
 
+    file { $ca_dir:
+      ensure => directory,
+    }
+
     file { "${ca_dir}/ca.crt":
       ensure  => file,
       content => $_ca_cert,

diff --git a/manifests/repo.pp b/manifests/repo.pp