fix nssdb::create manage_certdir => false

Contargo · Jan 15, 2014 · a6e58ff · a6e58ff
1 parent 639d62e
commit a6e58ff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/manifests/create.pp b/manifests/create.pp
@@ -45,6 +45,11 @@
       owner   => $owner_id,
       group   => $group_id,
     }
+
+    $require_certdir = File[$certdir]
+
+  } else {
+    $require_certdir = undef
   }
 
   file { "${certdir}/password.conf":
@@ -53,10 +58,9 @@
     owner   => $owner_id,
     group   => $group_id,
     content => $password,
-    require => [
-      File[$certdir],
-    ],
+    require => $require_certdir,
   }
+
   file { [
     "${certdir}/cert8.db",
     "${certdir}/key3.db",
@@ -76,7 +80,6 @@
     command => "/usr/bin/certutil -N -d ${certdir} -f ${certdir}/password.conf",
     creates => ["${certdir}/cert8.db", "${certdir}/key3.db", "${certdir}/secmod.db"],
     require => [
-      File[$certdir],
       File["${certdir}/password.conf"],
       Class['nssdb'],
     ]

diff --git a/spec/defines/nssdb_create_spec.rb b/spec/defines/nssdb_create_spec.rb
@@ -41,7 +41,10 @@
             :owner   => 'nobody',
             :group   => 'nobody',
             :mode    => '0600',
-            :require => [ 'File[/obsolete/password.conf]', 'Exec[create_nss_db]']
+            :require => [
+              'File[/obsolete/password.conf]',
+              'Exec[create_nss_db]',
+            ]
           )
         end
       end
@@ -57,7 +60,6 @@
             '/obsolete/secmod.db'
           ],
           :require => [
-            'File[/obsolete]',
             'File[/obsolete/password.conf]',
             'Class[Nssdb]'
           ]
@@ -90,7 +92,6 @@
           :group   => 'nobody',
           :mode    => '0660',
           :content => 'secret',
-          :require => 'File[/obsolete]'
         )
       end
     end
@@ -119,7 +120,6 @@
             '/obsolete/secmod.db'
           ],
           :require => [
-            'File[/obsolete]',
             'File[/obsolete/password.conf]',
             'Class[Nssdb]'
           ]