867e9fe22e
This commit removes the dependency cycle caused by a typo in the config name for config.ini and properly threads through the vardir setting to the puppetdb::server::global class.
32 lines
756 B
Puppet
32 lines
756 B
Puppet
# PRIVATE CLASS - do not use directly
|
|
class puppetdb::server::global (
|
|
$vardir = $puppetdb::params::vardir,
|
|
$confdir = $puppetdb::params::confdir,
|
|
$puppetdb_user = $puppetdb::params::puppetdb_user,
|
|
$puppetdb_group = $puppetdb::params::puppetdb_group,
|
|
) inherits puppetdb::params {
|
|
|
|
$config_ini = "${confdir}/config.ini"
|
|
|
|
file { $config_ini:
|
|
ensure => file,
|
|
owner => $puppetdb_user,
|
|
group => $puppetdb_group,
|
|
mode => '0600',
|
|
}
|
|
|
|
# Set the defaults
|
|
Ini_setting {
|
|
path => $config_ini,
|
|
ensure => 'present',
|
|
section => 'global',
|
|
require => File[$config_ini],
|
|
}
|
|
|
|
if $vardir {
|
|
ini_setting { 'puppetdb_global_vardir':
|
|
setting => 'vardir',
|
|
value => $vardir,
|
|
}
|
|
}
|
|
}
|