add mode parameter to nssdb::create

Puppet-Finland · Jan 14, 2014 · ca21742 · ca21742
1 parent 398e639
commit ca21742
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/manifests/create.pp b/manifests/create.pp
@@ -34,6 +34,7 @@
   $owner_id,
   $group_id,
   $password,
+  $mode    = '0600',
   $basedir = '/etc/pki',
   $cacert = '/etc/pki/certs/CA/ca.crt',
   $canickname = 'CA',
@@ -49,7 +50,7 @@
   }
   file {"${basedir}/${dbname}/password.conf":
     ensure  => file,
-    mode    => 0600,
+    mode    => $mode,
     owner   => $owner_id,
     group   => $group_id,
     content => $password,
@@ -59,7 +60,7 @@
   }
   file { ["${basedir}/${dbname}/cert8.db", "${basedir}/${dbname}/key3.db", "${basedir}/${dbname}/secmod.db"] :
     ensure  => file,
-    mode    => 0600,
+    mode    => $mode,
     owner   => $owner_id,
     group   => $group_id,
     require => [

diff --git a/spec/defines/nssdb_create_spec.rb b/spec/defines/nssdb_create_spec.rb
@@ -5,6 +5,7 @@
     let(:params) do {
         :owner_id   => 'nobody',
         :group_id   => 'nobody',
+        :mode       => '0660',
         :password   => 'secret',
         :basedir    => '/obsolete',
         :cacert     => '/ca.crt',
@@ -24,6 +25,7 @@
         it{ should contain_file('/obsolete/test/password.conf').with(
             :owner   => 'nobody',
             :group   => 'nobody',
+            :mode    => '0660',
             :content => 'secret',
             :require => 'File[/obsolete/test]'
         )}
@@ -35,6 +37,7 @@
             it{ should contain_file('/obsolete/test/' + db).with(
                 :owner   => 'nobody',
                 :group   => 'nobody',
+                :mode    => '0660',
                 :require => [ 'File[/obsolete/test/password.conf]', 'Exec[create_nss_db]']
             )}
         end