opuppet/module-puppetdb
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #107 from ebarrere/ebFix_puppetdb_conn_validator

Browse source 
Fix puppetlabs#106 and one other bug when disable_ssl = true
This commit is contained in:
Ken Barber 2014-01-10 10:32:26 -08:00
commit 10ea45f7a4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
manifests/master/config.pp
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],
}

2
manifests/master/puppetdb_conf.pp
View file

@ -3,7 +3,7 @@
class puppetdb::master::puppetdb_conf (
$server = 'localhost',
$port = '8081',
$soft_write_failure = false,
$soft_write_failure = $puppetdb::disable_ssl ? { true => true, default => false, },
$puppet_confdir = $puppetdb::params::puppet_confdir,
) inherits puppetdb::params {