confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

Recommit for updates in build 74

Browse Source
This commit is contained in:
Jenkins Server
2025-10-27 15:49:07 +01:00
parent e783481ed5
commit 5c8f6fc0f5
8 changed files with 15 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
doc/_index.html
View File

@@ -93,11 +93,6 @@
</li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html" title="puppet_classes::puppet_cd::main::user (puppet_class)">puppet_cd::main::user</a></span>
@@ -108,21 +103,6 @@
</li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html" title="puppet_classes::puppet_cd::puppetdb::files (puppet_class)">puppet_cd::puppetdb::files</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html" title="puppet_classes::puppet_cd::puppetdb::service (puppet_class)">puppet_cd::puppetdb::service</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span>

6
doc/file.README.html
View File

@@ -66,7 +66,9 @@
<h2 id="label-Synopsis">Synopsis</h2>
<p>This Puppet module configures settings for Puppet master and agents, PuppetDB and R10k, the full bundle. The syntax is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.</p>
<p>This Puppet module configures settings for Puppet master , agents and R10k, the full bundle. Puppetdb has been outsourced to a <a href="https://gitlab.confdroid.com/puppet/puppetdb_cd">module</a> on its own, due to complexity</p>
<p>The syntax is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.</p>
<h2 id="label-WARNING">WARNING</h2>
@@ -76,8 +78,6 @@
<ul><li>
<p>if the host FQDN matches your specified Puppet master via <code>$pt_pm_fqdn</code>, it installs and configures a puppetmaster. On your puppetmaster, If you set <code>$pt_use_r10k</code>to <code>true</code>, it also installs r10k to connect to a control repo and manage the code available to clients via Puppetfile. If you set <code>$pt_use_r10k_webhook</code>to <code>true</code>, it also installs a simple webhook listener to watch for post_hooks from gitlab, and triggers the r10k deployment.</p>
</li><li>
<p>if the host FQDN matches your specified puppetdb host via <code>$pt_db_fqdn</code>, Puppetdb is installed and added to the puppetmaster config. Settings for the (external) postgreSQL database are also configured.</p>
</li><li>
<p>open firewall ports depending on fqdn choices</p>
</li><li>
<p>start services as required</p>

6
doc/index.html
View File

@@ -66,7 +66,9 @@
<h2 id="label-Synopsis">Synopsis</h2>
<p>This Puppet module configures settings for Puppet master and agents, PuppetDB and R10k, the full bundle. The syntax is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.</p>
<p>This Puppet module configures settings for Puppet master , agents and R10k, the full bundle. Puppetdb has been outsourced to a <a href="https://gitlab.confdroid.com/puppet/puppetdb_cd">module</a> on its own, due to complexity</p>
<p>The syntax is specifically for Puppet Core 8 and Rocky 9, although might work elsewhere as well. This module is also designed to work with External Node Classifiers (ENC), for instance Foreman.</p>
<h2 id="label-WARNING">WARNING</h2>
@@ -76,8 +78,6 @@
<ul><li>
<p>if the host FQDN matches your specified Puppet master via <code>$pt_pm_fqdn</code>, it installs and configures a puppetmaster. On your puppetmaster, If you set <code>$pt_use_r10k</code>to <code>true</code>, it also installs r10k to connect to a control repo and manage the code available to clients via Puppetfile. If you set <code>$pt_use_r10k_webhook</code>to <code>true</code>, it also installs a simple webhook listener to watch for post_hooks from gitlab, and triggers the r10k deployment.</p>
</li><li>
<p>if the host FQDN matches your specified puppetdb host via <code>$pt_db_fqdn</code>, Puppetdb is installed and added to the puppetmaster config. Settings for the (external) postgreSQL database are also configured.</p>
</li><li>
<p>open firewall ports depending on fqdn choices</p>
</li><li>
<p>start services as required</p>

32
doc/puppet_class_list.html
View File

@@ -71,48 +71,20 @@
</li>
<li id="object_puppet_classes::puppet_cd::main::install" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::main::user" class="odd">
<li id="object_puppet_classes::puppet_cd::main::user" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html" title="puppet_classes::puppet_cd::main::user (puppet_class)">puppet_cd::main::user</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::params" class="even">
<li id="object_puppet_classes::puppet_cd::params" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::puppetdb::dirs" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::puppetdb::files" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html" title="puppet_classes::puppet_cd::puppetdb::files (puppet_class)">puppet_cd::puppetdb::files</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::puppetdb::service" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html" title="puppet_classes::puppet_cd::puppetdb::service (puppet_class)">puppet_cd::puppetdb::service</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::r10k::install" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span>

10
doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
View File

@@ -109,11 +109,7 @@
11
12
13
14
15
16
17
18</pre>
14</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
@@ -123,10 +119,6 @@ class puppet_cd::main::config (
) inherits puppet_cd::params {
include puppet_cd::server::service
if $pt_use_puppetdb == true {
include puppet_cd::puppetdb::service
}
if $pt_use_r10k == true {
include puppet_cd::r10k::install
}

48
doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
View File

@@ -129,30 +129,7 @@
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57</pre>
34</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -185,29 +162,6 @@ class puppet_cd::main::files (
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],
}
# fix service file syslog vs journald
file { $pt_puppetdb_service_file:
ensure =&gt; file,
path =&gt; $pt_puppetdb_service_file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
content =&gt; template($pt_puppetdb_service_erb),
notify =&gt; Service[$pt_db_service],
}
}
}</pre>
</td>
</tr>

40
doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html
View File

@@ -122,26 +122,7 @@
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46</pre>
27</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/user.pp', line 6</span>
@@ -167,25 +148,6 @@ class puppet_cd::main::user (
allowdupe =&gt; false,
}
}
if ($fqdn == $pt_db_fqdn) and ($pt_manage_db_user == true) {
user { $pt_db_user:
ensure =&gt; present,
name =&gt; $pt_db_user,
allowdupe =&gt; false,
comment =&gt; $pt_db_user_comment,
gid =&gt; $pt_db_user,
managehome =&gt; true,
home =&gt; $pt_db_user_home,
shell =&gt; $pt_db_user_shell,
}
group { $pt_db_user:
ensure =&gt; present,
name =&gt; $pt_db_user,
allowdupe =&gt; false,
}
}
}</pre>
</td>
</tr>

196
doc/puppet_classes/puppet_cd_3A_3Aparams.html
View File

@@ -75,18 +75,10 @@
<span class='object_link'><a href="puppet_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::puppet_cd::main::config (puppet_class)">puppet_cd::main::config</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Afiles.html" title="puppet_classes::puppet_cd::puppetdb::files (puppet_class)">puppet_cd::puppetdb::files</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::puppet_cd::server::service (puppet_class)">puppet_cd::server::service</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Aservice.html" title="puppet_classes::puppet_cd::puppetdb::service (puppet_class)">puppet_cd::puppetdb::service</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::puppet_cd::firewall::iptables (puppet_class)">puppet_cd::firewall::iptables</a></span><br/>
</dd>
@@ -162,8 +154,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;puppetdb.example.net&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -270,8 +260,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;8080&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -288,8 +276,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;8081&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -306,8 +292,6 @@
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
&mdash;
<div class='inline'>
@@ -396,8 +380,6 @@
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
@@ -414,8 +396,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;puppetdb&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -432,8 +412,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;PuppetDB daemon&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -450,8 +428,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/opt/puppetlabs/server/data/puppetdb&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -468,8 +444,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/sbin/nologin&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -486,8 +460,6 @@
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
@@ -990,8 +962,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;200MB&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1008,8 +978,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;90&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1026,8 +994,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1GB&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1044,8 +1010,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;4&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1062,8 +1026,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;4&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1080,8 +1042,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;//localhost:5432/puppetdb&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1098,8 +1058,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;foobar&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1116,8 +1074,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;foobar&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1134,8 +1090,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;60&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1152,8 +1106,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;10&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1170,8 +1122,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;0.0.0.0/0&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1188,8 +1138,6 @@
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
@@ -1206,8 +1154,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;0.0.0.0&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1224,8 +1170,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;0.0.0.0&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1242,8 +1186,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/puppetlabs/puppetdb/ssl/private.pem&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1260,8 +1202,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/puppetlabs/puppetdb/ssl/public.pem&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1278,8 +1218,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/puppetlabs/puppetdb/ssl/ca.pem&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1296,8 +1234,6 @@
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
@@ -1314,8 +1250,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/puppetlabs/puppetdb/request-logging.xml&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1332,8 +1266,6 @@
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
@@ -1350,8 +1282,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;8082&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1368,8 +1298,6 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;127.0.0.1&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1638,65 +1566,7 @@
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252</pre>
194</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 89</span>
@@ -1705,7 +1575,6 @@ 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;,
# installation
String $pt_pkg_ensure = &#39;latest&#39;,
@@ -1722,12 +1591,7 @@ class puppet_cd::params (
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 = 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;,
String $pt_db_user_shell = &#39;/sbin/nologin&#39;,
# templates
## puppet
String $pt_environment = &#39;production&#39;,
@@ -1757,33 +1621,6 @@ class puppet_cd::params (
String $pt_storeconfigs_backend = &#39;puppetdb&#39;,
String $pt_parser = &#39;current&#39;,
Boolean $pt_cert_revocation = true,
## puppetdb
Boolean $pt_use_puppetdb = false,
String $pt_logging_max_file_size = &#39;200MB&#39;,
String $pt_logging_max_history = &#39;90&#39;,
String $pt_logging_total_size = &#39;1GB&#39;,
String $pt_com_proc_threads = &#39;4&#39;,
String $pt_concurrent_writes = &#39;4&#39;,
String $pt_db_subname = &#39;//localhost:5432/puppetdb&#39;,
String $pt_db_username = &#39;foobar&#39;,
String $pt_db_password = &#39;foobar&#39;,
String $pt_gc_interval = &#39;60&#39;,
String $pt_log_slow_statements = &#39;10&#39;,
String $pt_no_ssl_port = &#39;8080&#39;,
String $pt_ssl_port = &#39;8081&#39;,
Boolean $pt_use_ssl_only = true,
String $pt_puppetdb_source_lan = &#39;0.0.0.0/0&#39;,
Boolean $pt_soft_write_failure = false,
String $pt_no_ssl_host = &#39;0.0.0.0&#39;,
String $pt_ssl_host = &#39;0.0.0.0&#39;,
String $pt_ssl_key = &#39;/etc/puppetlabs/puppetdb/ssl/private.pem&#39;,
String $pt_ssl_cert = &#39;/etc/puppetlabs/puppetdb/ssl/public.pem&#39;,
String $pt_ssl_ca_cert = &#39;/etc/puppetlabs/puppetdb/ssl/ca.pem&#39;,
Boolean $pt_log_access = false,
String $pt_access_log_config = &#39;/etc/puppetlabs/puppetdb/request-logging.xml&#39;,
Boolean $pt_enable_repl = false,
String $pt_repl_port = &#39;8082&#39;,
String $pt_repl_host = &#39;127.0.0.1&#39;,
# r10k
Boolean $pt_use_r10k = false,
@@ -1812,12 +1649,7 @@ class puppet_cd::params (
$pt_rundir_master = &#39;/var/run/puppetlabs/puppetserver&#39;
$pt_vardir = &#39;/opt/puppetlabs/puppet/cache&#39;
$pt_vardir_master = &#39;/opt/puppetlabs/server/data/puppetserver&#39;
## puppetdb
$pt_puppetdb_main = &#39;/etc/puppetlabs/puppetdb&#39;
$pt_puppetdb_conf_d = &quot;${pt_puppetdb_main}/conf.d&quot;
$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;
$pt_r10k_webhook_dir = &#39;/etc/r10k-webhook&#39;
@@ -1828,26 +1660,7 @@ class puppet_cd::params (
$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;
## puppetdb
$pt_bootstrap_conf = &quot;${pt_puppetdb_main}/bootstrap.cfg&quot;
$pt_bootstrap_erb = &#39;puppet_cd/puppetdb/bootstrap.cfg.erb&#39;
$pt_puppetdb_access_log = &quot;${pt_puppetdb_log}/puppetdb-access&quot;
$pt_request_logging_conf = &quot;${pt_puppetdb_main}/request-logging.xml&quot;
$pt_request_logging_erb = &#39;puppet_cd/puppetdb/request_logging.xml.erb&#39;
$pt_logback_conf = &quot;${pt_puppetdb_main}/logback.xml&quot;
$pt_logback_erb = &#39;puppet_cd/puppetdb/logback.xml.erb&#39;
$pt_puppetdb_config_ini = &quot;${pt_puppetdb_conf_d}/config.ini&quot;
$pt_puppetdb_config_erb = &#39;puppet_cd/puppetdb/config.ini.erb&#39;
$pt_puppetdb_database_ini = &quot;${pt_puppetdb_conf_d}/database.ini&quot;
$pt_puppetdb_database_erb = &#39;puppet_cd/puppetdb/database.ini.erb&#39;
$pt_puppetdb_jetty_ini = &quot;${pt_puppetdb_conf_d}/jetty.ini&quot;
$pt_puppetdb_jetty_erb = &#39;puppet_cd/puppetdb/jetty.ini.erb&#39;
$pt_puppetdb_conf_file = &quot;${pt_puppetdir}/puppetdb.conf&quot;
$pt_puppetdb_conf_erb = &#39;puppet_cd/puppetdb/puppetdb.conf.erb&#39;
$pt_puppetdb_repl_ini = &quot;${pt_puppetdb_conf_d}/repl.ini&quot;
$pt_puppetdb_repl_erb = &#39;puppet_cd/puppetdb/repl.ini.erb&#39;
$pt_puppetdb_service_file = &#39;/usr/lib/systemd/system/puppetdb.service&#39;
$pt_puppetdb_service_erb = &#39;puppet_cd/puppetdb/puppetdb_service.erb&#39;
## r10k
$pt_r10k_file = &quot;${pt_r10k_dir}/r10k.yaml&quot;
$pt_r10k_erb = &#39;puppet_cd/r10k/r10k.yaml.erb&#39;
@@ -1858,7 +1671,6 @@ class puppet_cd::params (
# service
$pt_server_service = &#39;puppetserver&#39;
$pt_agent_service = &#39;puppet&#39;
$pt_db_service = &#39;puppetdb&#39;
$pt_r10k_webhook_service = &#39;r10k_gitlab_webhook&#39;
#