confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

Merge branch 'jenkins-build-65' into 'master'

Browse Source 
Auto-merge for build 65

See merge request puppet/puppet_cd!61
This commit is contained in:
Jenkins
2025-10-26 16:55:34 +00:00
parent d6fb5732f4 1a96519f07
commit 20bf0b37d9
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/puppet_classes/puppet_cd_3A_3Aparams.html
View File

@@ -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>
&mdash;
@@ -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>
&mdash;
@@ -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 = &#39;puppet&#39;,
String $pt_user_comment = &#39;puppetserver daemon&#39;,
String $pt_user_home = &#39;/opt/puppetlabs/server/data/puppetserver&#39;,
String $pt_user_shell = &#39;/sbin/nologin&#39;,
## puppetdb user
Boolean $pt_manage_db_user = true,
Boolean $pt_manage_db_user = false,
String $pt_db_user = &#39;puppetdb&#39;,
String $pt_db_user_comment = &#39;PuppetDB daemon&#39;,
String $pt_db_user_home = &#39;/opt/puppetlabs/server/data/puppetdb&#39;,

2
doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
View File

@@ -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

2
doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
View File

@@ -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

4
manifests/params.pp
View File

@@ -102,13 +102,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',

2
manifests/puppetdb/dirs.pp
View File

@@ -6,7 +6,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

2
manifests/puppetdb/files.pp
View File

@@ -6,7 +6,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