Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

puppetdb_ssl renamed to puppetdb_ssl_verify #51

Merged
merged 1 commit into from
Sep 8, 2014
Merged

puppetdb_ssl renamed to puppetdb_ssl_verify #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ If you would like to use certificate auth into the PuppetDB service, use any of

class { 'puppetboard':
manage_virtualenv => true,
puppetdb_host => 'puppet.example.com',
puppetdb_port => '8081',
puppetdb_key => "/var/lib/puppet/ssl/private_keys/${::certname}.pem",
puppetdb_ssl => 'True',
puppetdb_cert => "/var/lib/puppet/ssl/certs/${::certname}.pem",
puppetdb_host => 'puppet.example.com',
puppetdb_port => '8081',
puppetdb_key => "/var/lib/puppet/ssl/private_keys/${::certname}.pem",
puppetdb_ssl_verify => 'True',
puppetdb_cert => "/var/lib/puppet/ssl/certs/${::certname}.pem",
}

```
Expand All @@ -196,11 +196,11 @@ Note that the above only works if you have the Puppet CA root certificate added

class { 'puppetboard':
manage_virtualenv => true,
puppetdb_host => 'puppet.example.com',
puppetdb_port => '8081',
puppetdb_key => "/var/lib/puppet/ssl/private_keys/${::certname}.pem",
puppetdb_ssl => "'/var/lib/puppet/ssl/certs/ca.pem'",
puppetdb_cert => "/var/lib/puppet/ssl/certs/${::certname}.pem",
puppetdb_host => 'puppet.example.com',
puppetdb_port => '8081',
puppetdb_key => "/var/lib/puppet/ssl/private_keys/${::certname}.pem",
puppetdb_ssl_verify => "'/var/lib/puppet/ssl/certs/ca.pem'",
puppetdb_cert => "/var/lib/puppet/ssl/certs/${::certname}.pem",
}

```
Expand Down
8 changes: 4 additions & 4 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
# (string, absolute path) path to PuppetMaster/CA signed client SSL key
# Defaults to 'None' ($::puppetboard::params::puppetdb_key)
#
# [*puppetdb_ssl*]
# (string) whether PuppetDB uses SSL or not, 'True' or 'False'.
# Defaults to 'False' ($::puppetboard::params::puppetdb_ssl)
# [*puppetdb_ssl_verify*]
# (string) whether PuppetDB uses SSL or not, 'True' or 'False', or the path to the puppet CA
# Defaults to 'False' ($::puppetboard::params::puppetdb_ssl_verify)
#
# [*puppetdb_cert*]
# (string, absolute path) path to PuppetMaster/CA signed client SSL cert
Expand Down Expand Up @@ -131,7 +131,7 @@
$puppetdb_host = $::puppetboard::params::puppetdb_host,
$puppetdb_port = $::puppetboard::params::puppetdb_port,
$puppetdb_key = $::puppetboard::params::puppetdb_key,
$puppetdb_ssl = $::puppetboard::params::puppetdb_ssl,
$puppetdb_ssl_verify = $::puppetboard::params::puppetdb_ssl_verify,
$puppetdb_cert = $::puppetboard::params::puppetdb_cert,
$puppetdb_timeout = $::puppetboard::params::puppetdb_timeout,
$unresponsive = $::puppetboard::params::unresponsive,
Expand Down
2 changes: 1 addition & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
$puppetdb_host = 'localhost'
$puppetdb_port = 8080
$puppetdb_key = undef
$puppetdb_ssl = false
$puppetdb_ssl_verify = false
$puppetdb_cert = undef
$puppetdb_timeout = 20
$dev_listen_host = '127.0.0.1'
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/class_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class { 'puppetboard':
puppetdb_host => 'puppet.example.com',
puppetdb_port => '8081',
puppetdb_key => "/var/lib/puppet/ssl/private_keys/test.networkninjas.net.pem",
puppetdb_ssl => 'True',
puppetdb_ssl_verify => 'True',
puppetdb_cert => "/var/lib/puppet/ssl/certs/test.networkninjas.net.pem",
}
EOS
Expand Down