3
0

Recommit for updates in build 70

This commit is contained in:
2025-10-27 13:41:44 +01:00
parent 888eecbb65
commit fae2421e33
2 changed files with 30 additions and 4 deletions

View File

@@ -141,7 +141,18 @@
43
44
45
46</pre>
46
47
48
49
50
51
52
53
54
55
56
57</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -185,6 +196,17 @@ class puppet_cd::main::files (
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>

View File

@@ -180,7 +180,7 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
<em class="default">(defaults to: <tt>&#39;latest&#39;</tt>)</em>
&mdash;
@@ -1694,7 +1694,9 @@
247
248
249
250</pre>
250
251
252</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 89</span>
@@ -1706,7 +1708,7 @@ class puppet_cd::params (
String $pt_db_fqdn = &#39;puppetdb.example.net&#39;,
# installation
String $pt_pkg_ensure = &#39;present&#39;,
String $pt_pkg_ensure = &#39;latest&#39;,
String $pt_agent_pkg = &#39;puppet-agent&#39;,
String $pt_server_pkg = &#39;puppetserver&#39;,
Array $pt_db_pkg = [&#39;puppetdb&#39;,&#39;puppetdb-termini&#39;],
@@ -1844,6 +1846,8 @@ class puppet_cd::params (
$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;