fix multiple nssdb::create declarations

Puppet-Finland · Jan 15, 2014 · 1be0034 · 1be0034
1 parent 2a212ec
commit 1be0034
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/manifests/create.pp b/manifests/create.pp
@@ -72,11 +72,11 @@
  group => $group_id,
  require => [
  File["${certdir}/password.conf"],
- Exec['create_nss_db'],
+ Exec["create_nss_db_${title}"],
  ],
  }
 
- exec {'create_nss_db':
+ exec { "create_nss_db_${title}":
  command => "/usr/bin/certutil -N -d ${certdir} -f ${certdir}/password.conf",
  creates => ["${certdir}/cert8.db", "${certdir}/key3.db", "${certdir}/secmod.db"],
  require => [

diff --git a/spec/defines/nssdb_create_spec.rb b/spec/defines/nssdb_create_spec.rb
@@ -43,7 +43,7 @@
  :mode => '0600',
  :require => [
  'File[/obsolete/password.conf]',
- 'Exec[create_nss_db]',
+ 'Exec[create_nss_db_/obsolete]',
  ]
  )
  end
@@ -52,7 +52,7 @@
 
  context 'create nss db' do
  it do
- should contain_exec('create_nss_db').with(
+ should contain_exec('create_nss_db_/obsolete').with(
  :command => %r{-d /obsolete -f /obsolete},
  :creates => [
  '/obsolete/cert8.db',
@@ -104,15 +104,15 @@
  :owner => 'nobody',
  :group => 'nobody',
  :mode => '0660',
- :require => [ 'File[/obsolete/password.conf]', 'Exec[create_nss_db]']
+ :require => [ 'File[/obsolete/password.conf]', 'Exec[create_nss_db_/obsolete]']
  )
  end
  end
  end
 
  context 'create nss db' do
  it do
- should contain_exec('create_nss_db').with(
+ should contain_exec('create_nss_db_/obsolete').with(
  :command => %r{-d /obsolete -f /obsolete},
  :creates => [
  '/obsolete/cert8.db',