Skip to content

Commit

Permalink
Merge pull request jhoblitt#2 from jhoblitt/feature/cleanups
Browse files Browse the repository at this point in the history
fix linter warnings
  • Loading branch information
Joshua Hoblitt committed Nov 18, 2014
2 parents 8ac26ef + 7e43fbf commit c2ebee2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions manifests/create_cert_and_key.pp
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@
# }
#
define nsstools::create_cert_and_key(
$nickname = $title,
$subject,
$certdir,
$nickname = $title,
$keytype = 'rsa',
$noisefile = '/var/log/messages',
$certdir,
) {
include nsstools
include nsstools::params

validate_string($nickname)
validate_string($subject)
validate_re($keytype, [ '^rsa', '^dsa', '^ec', '^all' ])
validate_absolute_path($certdir)
validate_string($nickname)
validate_re($keytype, [ '^rsa', '^dsa', '^ec', '^all' ])
validate_absolute_path($noisefile)

$_password_file = "${certdir}/${nsstools::params::password_file_name}"
Expand Down
6 changes: 3 additions & 3 deletions tests/create.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

# Add a certificate and private key from PEM fiels
nsstools::add_cert_and_key { 'test':
certdir => '/tmp/nsstools',
cert => '/tmp/cert.pem',
key => '/tmp/key.pem',
certdir => '/tmp/nsstools',
cert => '/tmp/cert.pem',
key => '/tmp/key.pem',
}

# You can confirm that things are loaded properly with:
Expand Down

0 comments on commit c2ebee2

Please sign in to comment.