confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

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

Browse Source 
Auto-merge for build 22

See merge request puppet/puppet_cd!19
This commit is contained in:
Jenkins
2025-10-23 18:31:40 +00:00
parent d6624c5849 b849ac0994
commit 3549a6b5ae
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/puppet_classes/puppet_cd_3A_3Aparams.html
View File

@@ -1670,7 +1670,10 @@
238
239
240
241</pre>
241
242
243
244</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 88</span>
@@ -1791,6 +1794,8 @@ class puppet_cd::params (
$pt_puppetdb_ssl = &quot;${pt_puppetdb_main}/ssl&quot;
$pt_puppetdb_log = &#39;/var/log/puppetlabs/puppetdb&#39;
$pt_puppetdb_var_dir = &#39;/opt/puppetlabs/server/data/puppetdb&#39;
## r10k
$pt_r10k_dir = &quot;${pt_main_dir}/r10k&quot;
# files
## puppet
@@ -1818,6 +1823,7 @@ class puppet_cd::params (
$pt_puppetdb_repl_erb = &#39;puppet_cd/puppetdb/repl.ini.erb&#39;
## r10k
$pt_r10k_hook_file = &#39;/usr/local/bin/webhook&#39;
$pt_r10k_erb = &#39;puppet_cd/r10k/r10k.yaml.erb&#39;
# service
$pt_server_service = &#39;puppetserver&#39;

3
manifests/params.pp
View File

@@ -201,6 +201,8 @@ class puppet_cd::params (
$pt_puppetdb_ssl = "${pt_puppetdb_main}/ssl"
$pt_puppetdb_log = '/var/log/puppetlabs/puppetdb'
$pt_puppetdb_var_dir = '/opt/puppetlabs/server/data/puppetdb'
## r10k
$pt_r10k_dir = "${pt_main_dir}/r10k"
# files
## puppet
@@ -228,6 +230,7 @@ class puppet_cd::params (
$pt_puppetdb_repl_erb = 'puppet_cd/puppetdb/repl.ini.erb'
## r10k
$pt_r10k_hook_file = '/usr/local/bin/webhook'
$pt_r10k_erb = 'puppet_cd/r10k/r10k.yaml.erb'
# service
$pt_server_service = 'puppetserver'