change pkcs12 file generation to be based on existence of the output …

…file
Contargo · Jan 15, 2014 · c208f6e · c208f6e
1 parent 5011b56
commit c208f6e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/manifests/add_cert_and_key.pp b/manifests/add_cert_and_key.pp
@@ -34,13 +34,13 @@
   $pkcs12_name = downcase(regsubst("${nickname}.p12", '[\s]', '_', 'GM'))
 
   exec {"generate_pkcs12_${title}":
-    command     => "/usr/bin/openssl pkcs12 -export -in ${cert} -inkey ${key} -password 'file:${certdir}/password.conf' -out '${certdir}/${pkcs12_name}' -name '${nickname}'",
-    require     => [
+    command   => "/usr/bin/openssl pkcs12 -export -in ${cert} -inkey ${key} -password 'file:${certdir}/password.conf' -out '${certdir}/${pkcs12_name}' -name '${nickname}'",
+    require   => [
       Nssdb::Create[$certdir],
       Class['nssdb'],
     ],
-    subscribe   => File["${certdir}/password.conf"],
-    refreshonly => true,
+    creates   => "${certdir}/${pkcs12_name}",
+    subscribe => File["${certdir}/password.conf"],
   }
 
   exec { "add_pkcs12_${title}":

diff --git a/spec/defines/nssdb_add_cert_and_key_spec.rb b/spec/defines/nssdb_add_cert_and_key_spec.rb
@@ -18,6 +18,7 @@
           'Nssdb::Create[/dne]',
           'Class[Nssdb]'
         ],
+        :creates   => '/dne/server-cert.p12',
         :subscribe => 'File[/dne/password.conf]'
       )
     end