3
0

Recommit for updates in build 78

This commit is contained in:
2025-10-27 23:06:35 +01:00
parent bfdfbea328
commit c78f50e5fd
2 changed files with 99 additions and 9 deletions

View File

@@ -129,7 +129,19 @@
31
32
33
34</pre>
34
35
36
37
38
39
40
41
42
43
44
45
46</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -161,6 +173,18 @@ class puppet_cd::main::files (
content =&gt; template($pt_puppet_conf_erb),
notify =&gt; Service[$pt_agent_service,$pt_server_service],
}
if $pt_use_puppetdb == true {
file { $pt_puppetdb_conf_file:
ensure =&gt; file,
path =&gt; $pt_puppetdb_conf_file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
content =&gt; template($pt_puppetdb_conf_erb),
notify =&gt; Service[$pt_agent_service,$pt_server_service],
}
}
}
}</pre>
</td>

View File

@@ -101,7 +101,7 @@
<div class="docstring">
<div class="discussion">
<p>puppet_cd::params.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid) settings are applied. any other fqdn # will be considered a puppet agent.</p>
<p>puppet_cd::params.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)</p>
</div>
</div>
@@ -130,6 +130,24 @@
</li>
<li>
<span class='name'>pt_use_puppetdb</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>whether to use puppetdb</p>
</div>
</li>
<li>
<span class='name'>pt_pm_fqdn</span>
@@ -143,7 +161,25 @@
&mdash;
<div class='inline'>
<p>the fqdn for the puppetmaster and master</p>
<p>the fqdn for the puppetmaster and master settings are applied. any other fqdn # will be considered a puppet agent.</p>
</div>
</li>
<li>
<span class='name'>pt_db_fqdn</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;puppetdb.example.net&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the fqdn for the puppetdb node.</p>
</div>
</li>
@@ -918,6 +954,24 @@
&mdash;
<div class='inline'>
<p>the port for the webhook listener</p>
</div>
</li>
<li>
<span class='name'>pt_ssl_port</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;8081&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the port for the puppetdb ssl port</p>
</div>
</li>
@@ -933,9 +987,6 @@
<pre class="lines">
54
55
56
57
58
59
@@ -1037,15 +1088,26 @@
155
156
157
158</pre>
158
159
160
161
162
163
164
165
166
167</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 54</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 57</span>
class puppet_cd::params (
Boolean $pt_manage_fw = true,
String $pt_pm_fqdn = &#39;puppetmaster.example.net&#39;,
String $pt_db_fqdn = &#39;puppetdb.example.net&#39;,
Boolean $pt_use_puppetdb = false,
# installation
String $pt_pkg_ensure = &#39;latest&#39;,
@@ -1092,6 +1154,9 @@ class puppet_cd::params (
String $pt_parser = &#39;current&#39;,
Boolean $pt_cert_revocation = true,
# puppetdb
String $pt_ssl_port = &#39;8081&#39;,
# r10k
Boolean $pt_use_r10k = false,
Boolean $pt_use_r10k_webhook = false,
@@ -1128,8 +1193,9 @@ class puppet_cd::params (
## puppet
$pt_puppet_conf_file = &quot;${pt_puppetdir}/puppet.conf&quot;
$pt_puppet_conf_erb = &#39;puppet_cd/puppet.conf.erb&#39;
$pt_agent_conf_erb = &#39;puppet_cd/agent.conf.erb&#39;
$pt_hiera_config = &quot;${pt_puppetdir}/hiera.yaml&quot;
$pt_puppetdb_conf_file = &quot;${pt_puppetdir}/puppetdb.conf&quot;
$pt_puppetdb_conf_erb = &#39;puppet_cd/puppetdb/puppetdb.conf.erb&#39;
## r10k
$pt_r10k_file = &quot;${pt_r10k_dir}/r10k.yaml&quot;