Recommit for updates in build 65
This commit is contained in:
@@ -396,7 +396,7 @@
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>true</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>false</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -1494,7 +1494,7 @@
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>true</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>false</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -1715,13 +1715,13 @@ class puppet_cd::params (
|
||||
|
||||
# user settings
|
||||
## puppet user
|
||||
Boolean $pt_manage_user = true,
|
||||
Boolean $pt_manage_user = false,
|
||||
String $pt_user = 'puppet',
|
||||
String $pt_user_comment = 'puppetserver daemon',
|
||||
String $pt_user_home = '/opt/puppetlabs/server/data/puppetserver',
|
||||
String $pt_user_shell = '/sbin/nologin',
|
||||
## puppetdb user
|
||||
Boolean $pt_manage_db_user = true,
|
||||
Boolean $pt_manage_db_user = false,
|
||||
String $pt_db_user = 'puppetdb',
|
||||
String $pt_db_user_comment = 'PuppetDB daemon',
|
||||
String $pt_db_user_home = '/opt/puppetlabs/server/data/puppetdb',
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
class puppet_cd::puppetdb::dirs (
|
||||
|
||||
) inherits puppet_cd::params {
|
||||
if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) {
|
||||
if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) {
|
||||
require puppet_cd::main::install
|
||||
|
||||
# main directory
|
||||
|
||||
@@ -220,7 +220,7 @@
|
||||
class puppet_cd::puppetdb::files (
|
||||
|
||||
) inherits puppet_cd::params {
|
||||
if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) {
|
||||
if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) {
|
||||
require puppet_cd::puppetdb::dirs
|
||||
|
||||
# bootstrap.cfg
|
||||
|
||||
Reference in New Issue
Block a user