Update nssdb to 2e163a21fb80d828afede2d4be6214f1171c4887

2e163a21fb80d828afede2d4be6214f1171c4887 Become 1.0.1
b9e3de3fef3eb359ebfba383cd3cf251e5913621 Use ensure_packages API to avoid dependency issues
398e63944c3723401a1a7701c8222c2b9ef7f10e Merge pull request #1 from rhaen/rspec_infrastructure
83d3fa63e093a01a3a3d5af435b3815bf2882624 Allow ruby 2.0.0 and puppet version 2.7 to fail
8989de17fad5d7bdeea96748346e3330168a7873 Added rspec test infrastructure, travis-ci, fixed typo

Puppetfile

@@ -95,7 +95,7 @@ mod 'nova',
   :git => 'https://github.com/stackforge/puppet-nova.git'
 
 mod 'nssdb',
-  :commit => 'b3799a9a7c62c3b5b7968f9860220a885b45fb8a',
+  :commit => '2e163a21fb80d828afede2d4be6214f1171c4887',
   :git => 'https://github.com/rcritten/puppet-nssdb.git'
 
 mod 'ntp',

nssdb/.fixtures.yml

@@ -0,0 +1,3 @@
+fixtures:
+  symlinks:
+    nssdb: "#{source_dir}"

nssdb/.travis.yml

@@ -0,0 +1,21 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - ruby-head
+script: "rake all"
+branches:
+  only:
+    - rspec_infrastructure
+env:
+  - PUPPET_GEM_VERSION="~> 2.7"
+  - PUPPET_GEM_VERSION="~> 3.3"
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 2.7"
+notifications:
+  email: false
+

nssdb/CHANGELOG

@@ -1,2 +1,5 @@
+2014-10-22 1.0.1
+- Use ensure_packages API to avoid dependency issues
+
 2013-08-22 1.0.0
 - Initial Release. Create the database, add certificates.

nssdb/Gemfile

@@ -0,0 +1,11 @@
+source :rubygems
+
+group :development, :test do
+  gem 'puppetlabs_spec_helper', :require => false
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end

nssdb/Modulefile

@@ -1,5 +1,5 @@
 name    'rcritten/nssdb'
-version '1.0.0'
+version '1.0.1'
 source 'git://github.com/rcritten/puppet-nssdb.git'
 author 'Rob Crittenden <[email protected]>'
 license 'Apache'

nssdb/Rakefile

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'puppetlabs_spec_helper/rake_tasks'
+require 'rake/clean'
+
+CLEAN.include('spec/fixtures/', 'spec/reports')
+
+task :spec => [:spec_prep]
+
+desc "Run all tasks (spec)"
+task :all => [ :spec ]

nssdb/manifests/add_cert_and_key.pp

@@ -31,7 +31,7 @@
   $key,
   $basedir = '/etc/pki'
 ) {
-  package { 'openssl': ensure => present }
+  ensure_packages(['openssl'])
 
   exec {'generate_pkcs12':
     command => "/usr/bin/openssl pkcs12 -export -in $cert -inkey $key -password 'file:${basedir}/${dbname}/password.conf' -out '${basedir}/${dbname}/$dbname.p12' -name $nickname",

nssdb/manifests/create.pp

@@ -21,8 +21,8 @@
 #   $password must be set
 #
 # Sample Usage:
-# 
-# secure::nssdb {'test':
+#
+# nssdb::create {'test':
 #    owner_id => 'qpidd',
 #    group_id => 'qpidd',
 #    password => 'test'}
@@ -39,7 +39,7 @@
   $canickname = 'CA',
   $catrust = 'CT,CT,'
 ) {
-  package { 'nss-tools': ensure => present }
+  ensure_packages(['nss-tools'])
 
   file {"${basedir}/${dbname}":
     ensure  => directory,

nssdb/spec/defines/nssdb_add_cert_and_key_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'nssdb::add_cert_and_key', :type => :define do
+        let(:title) { 'qpidd' }
+        let(:params) do {
+            :nickname => 'Server-Cert',
+            :cert     => '/tmp/server.cert',
+            :key      => '/tmp/server.key',
+            :basedir  => '/obsolete'
+        }
+        end
+
+        context 'generate_pkcs12' do
+            it{ should contain_exec('generate_pkcs12').with(
+                :command   => %r{-in /tmp/server.cert -inkey /tmp/server.key.*file:/obsolete/qpidd.*out \'/obsolete/qpidd/qpidd.p12\' -name Server-Cert},
+                :require   => [ 'File[/obsolete/qpidd/password.conf]',
+                                'File[/obsolete/qpidd/cert8.db]',
+                                'Package[openssl]' ],
+                :subscribe => 'File[/obsolete/qpidd/password.conf]'
+            )}
+        end
+
+        context 'load_pkcs12' do
+            it{ should contain_exec('load_pkcs12').with(
+                :command => %r{-i \'/obsolete/qpidd/qpidd.p12\' -d \'/obsolete/qpidd\' -w \'/obsolete/qpidd.*-k \'/obsolete/qpidd}
+            )}
+        end
+
+end

nssdb/spec/defines/nssdb_create_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe 'nssdb::create', :type => :define do
+    let(:title) { 'test' }
+    let(:params) do {
+        :owner_id   => 'nobody',
+        :group_id   => 'nobody',
+        :password   => 'secret',
+        :basedir    => '/obsolete',
+        :cacert     => '/ca.crt',
+        :canickname => 'ca',
+        :catrust    => 'CTu'
+    }
+    end
+
+    context 'nssdb directory' do
+        it{ should contain_file('/obsolete/test').with(
+            :owner => 'nobody',
+            :group => 'nobody'
+        )}
+    end
+
+    context 'password file' do
+        it{ should contain_file('/obsolete/test/password.conf').with(
+            :owner   => 'nobody',
+            :group   => 'nobody',
+            :content => 'secret',
+            :require => 'File[/obsolete/test]'
+        )}
+    end
+
+    context 'database files' do
+        databases = ['cert8.db', 'key3.db', 'secmod.db']
+        databases.each do |db|
+            it{ should contain_file('/obsolete/test/' + db).with(
+                :owner   => 'nobody',
+                :group   => 'nobody',
+                :require => [ 'File[/obsolete/test/password.conf]', 'Exec[create_nss_db]']
+            )}
+        end
+    end
+
+    context 'create nss db' do
+        it{ should contain_exec('create_nss_db').with(
+            :command => %r{-d /obsolete/test -f /obsolete/test},
+            :creates => [ '/obsolete/test/cert8.db', '/obsolete/test/key3.db', '/obsolete/test/secmod.db'],
+            :require => [ 'File[/obsolete/test]',
+                          'File[/obsolete/test/password.conf]',
+                          'Package[nss-tools]' ]
+        )}
+    end
+
+    context 'add ca cert' do
+        it{ should contain_exec('add_ca_cert').with(
+            :command => %r{-n ca -d /obsolete/test -t CTu.*-i /ca.crt},
+            :onlyif  => %r{-e /ca.crt}
+        )}
+    end
+
+end

nssdb/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'rubygems'
+require 'puppetlabs_spec_helper/module_spec_helper'