rename {owner,group}_id params to {owner,group}

README.md

@@ -7,14 +7,15 @@ and key via PEM files.
 
 ```
 nssdb::create { '/etc/dirsrv/slapd-ldap1':
-  owner_id       => 'nobody',
-  group_id       => 'nobody',
+  owner          => 'nobody',
+  group          => 'nobody',
   mode           => '0660',
   password       => 'example',
   manage_certdir => false,
 }
 
 nssdb::add_cert_and_key{ '/etc/dirsrv/slapd-ldap1':
+  certdir  => '/etc/dirsrv/slapd-ldap1',
   nickname => 'Server-Cert',
   cert     => '/tmp/foo.pem',
   key      => '/tmp/foo.key',

manifests/add_cert.pp

@@ -2,8 +2,8 @@
 #
 # Parameters:
 #   $nickname         - required - the nickname for the NSS certificate
-#   $cert             - required - path to certificate in PEM format
-#   $certdir          - optional - defaults to $title
+#   $cert             - optional - path to certificate in PEM format
+#   $certdir          - required - defaults to $title
 #   $trustargs        - optional - defaults to 'CT,,'
 #
 # Actions:
@@ -15,15 +15,15 @@
 #
 # Sample Usage:
 #
-#      nssdb::add_cert { '/etc/pki/foo':
+#      nssdb::add_cert { '/tmp/server.crt':
 #        nickname => 'GlobalSign Root CA',
-#        cert     => '/tmp/server.crt',
+#        certdir  => '/etc/pki/foo',
 #      }
 #
 define nssdb::add_cert(
   $nickname,
-  $cert,
-  $certdir   = $title,
+  $cert      = $title,
+  $certdir,
   $trustargs = 'CT,,'
 ) {
   include nssdb

manifests/create.pp

@@ -1,8 +1,8 @@
 # Create an empty NSS database with a password file.
 #
 # Parameters:
-#   $owner_id         - required - the file/directory user
-#   $group_id         - required - the file/directory group
+#   $owner         - required - the file/directory user
+#   $group         - required - the file/directory group
 #   $password         - required - password to set on the database
 #   $mode             - optional - defaults to '0600'
 #   $certdir_mode     - optional - defaults to '0700'
@@ -12,22 +12,22 @@
 #      cert8.db, key3.db, secmod.db and a password file, password.conf
 #
 # Requires:
-#   $owner_id must be set
-#   $group_id must be set
+#   $owner must be set
+#   $group must be set
 #   $password must be set
 #
 # Sample Usage:
 #
 # nssdb::create {'test':
-#    owner_id => 'qpidd',
-#    group_id => 'qpidd',
+#    owner => 'qpidd',
+#    group => 'qpidd',
 #    password => 'test'}
 #
 # This will create an NSS database in /etc/pki/test
 #
 define nssdb::create (
-  $owner_id,
-  $group_id,
+  $owner,
+  $group,
   $password,
   $mode           = '0600',
   $certdir_mode   = '0700',
@@ -42,8 +42,8 @@
     file { $certdir:
       ensure  => directory,
       mode    => $certdir_mode,
-      owner   => $owner_id,
-      group   => $group_id,
+      owner   => $owner,
+      group   => $group,
     }
 
     $require_certdir = File[$certdir]
@@ -55,8 +55,8 @@
   file { "${certdir}/password.conf":
     ensure  => file,
     mode    => $mode,
-    owner   => $owner_id,
-    group   => $group_id,
+    owner   => $owner,
+    group   => $group,
     content => $password,
     require => $require_certdir,
   }
@@ -68,8 +68,8 @@
   ]:
     ensure  => file,
     mode    => $mode,
-    owner   => $owner_id,
-    group   => $group_id,
+    owner   => $owner,
+    group   => $group,
     require => [
       File["${certdir}/password.conf"],
       Exec["create_nss_db_${title}"],

spec/defines/nssdb_add_cert_spec.rb

@@ -6,6 +6,7 @@
     {
       :nickname => 'GlobalSign Root CA',
       :cert     => '/tmp/server.crt',
+      :certdir  => '/dne',
     }
   end
 

spec/defines/nssdb_create_spec.rb

@@ -5,9 +5,9 @@
     let(:title) { '/obsolete' }
     let(:params) do
       {
-        :owner_id       => 'nobody',
-        :group_id       => 'nobody',
-        :password       => 'secret',
+        :owner    => 'nobody',
+        :group    => 'nobody',
+        :password => 'secret',
       }
     end
 
@@ -72,8 +72,8 @@
     let(:title) { '/obsolete' }
     let(:params) do
       {
-        :owner_id       => 'nobody',
-        :group_id       => 'nobody',
+        :owner          => 'nobody',
+        :group          => 'nobody',
         :mode           => '0660',
         :password       => 'secret',
         :manage_certdir => false,

tests/create.pp

@@ -1,21 +1,18 @@
 # NOTE: This requires that the directory /tmp/nssdb already exists
 
 # Create a test database owned by the user rcrit
-nssdb::create {'test':
-  owner_id => 'rcrit',
-  group_id => 'rcrit',
+nssdb::create { '/tmp/nssdb':
+  owner    => 'rcrit',
+  group    => 'rcrit',
   password => 'test',
-  cacert   => '/etc/ipa/ca.crt',
-  catrust  => 'CT,,',
-  basedir  => '/tmp/nssdb',
 }
 
 # Add a certificate and private key from PEM fiels
-nssdb::add_cert_and_key {'test':
+nssdb::add_cert_and_key { 'test':
+  certdir  => '/tmp/nssdb',
   cert     => '/tmp/cert.pem',
   key      => '/tmp/key.pem',
   nickname => 'test',
-  basedir  => '/tmp/nssdb',
 }
 
 # You can confirm that things are loaded properly with: