Fix issue with validator when disable_ssl = true

https://github.com/puppetlabs/puppetlabs-puppetdb/issues/106
This commit is contained in:
Elliott Barrere  2013-12-11 14:34:52 -08:00
parent 6b47c83477
commit 51a08a85b4

View file

@ -1,7 +1,7 @@
# Manage puppet configuration. See README.md for more details.
class puppetdb::master::config(
$puppetdb_server = $::fqdn,
$puppetdb_port = 8081,
$puppetdb_port = $puppetdb::disable_ssl ? { true => 8080, default => 8081, },
$puppetdb_soft_write_failure = false,
$manage_routes = true,
$manage_storeconfigs = true,
@ -28,6 +28,7 @@ class puppetdb::master::config(
puppetdb_conn_validator { 'puppetdb_conn':
puppetdb_server => $manage_config ? { true => $puppetdb_server, default => undef },
puppetdb_port => $manage_config ? { true => $puppetdb_port, default => undef },
use_ssl => $puppetdb_port ? { 8080 => false, default => true },
timeout => $puppetdb_startup_timeout,
require => Package[$terminus_package],
}