3
0

Recommit for updates in build 91

This commit is contained in:
2025-10-28 12:39:34 +01:00
parent e9cbdb62e2
commit 3f16a0c3eb
2 changed files with 28 additions and 2 deletions

View File

@@ -141,7 +141,18 @@
43 43
44 44
45 45
46</pre> 46
47
48
49
50
51
52
53
54
55
56
57</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -175,6 +186,7 @@ class puppet_cd::main::files (
} }
if $pt_use_puppetdb == true { if $pt_use_puppetdb == true {
# puppetdb.conf
file { $pt_puppetdb_conf_file: file { $pt_puppetdb_conf_file:
ensure =&gt; file, ensure =&gt; file,
path =&gt; $pt_puppetdb_conf_file, path =&gt; $pt_puppetdb_conf_file,
@@ -184,6 +196,16 @@ class puppet_cd::main::files (
content =&gt; template($pt_puppetdb_conf_erb), content =&gt; template($pt_puppetdb_conf_erb),
notify =&gt; Service[$pt_agent_service,$pt_server_service], notify =&gt; Service[$pt_agent_service,$pt_server_service],
} }
# routes.yaml
file { $pt_routes_file:
ensure =&gt; file,
path =&gt; $pt_routes_file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
content =&gt; template($pt_routes_erb),
notify =&gt; Service[$pt_server_service],
}
} }
} }
}</pre> }</pre>

View File

@@ -1129,7 +1129,9 @@
166 166
167 167
168 168
169</pre> 169
170
171</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 58</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 58</span>
@@ -1229,6 +1231,8 @@ class puppet_cd::params (
$pt_hiera_config = &quot;${pt_puppetdir}/hiera.yaml&quot; $pt_hiera_config = &quot;${pt_puppetdir}/hiera.yaml&quot;
$pt_puppetdb_conf_file = &quot;${pt_puppetdir}/puppetdb.conf&quot; $pt_puppetdb_conf_file = &quot;${pt_puppetdir}/puppetdb.conf&quot;
$pt_puppetdb_conf_erb = &#39;puppet_cd/puppetdb/puppetdb.conf.erb&#39; $pt_puppetdb_conf_erb = &#39;puppet_cd/puppetdb/puppetdb.conf.erb&#39;
$pt_routes_file = &quot;${pt_puppetdir}/routes.yaml&quot;
$pt_routes_erb = &#39;puppet_cd/puppetdb/routes.yaml.erb&#39;
## r10k ## r10k
$pt_r10k_file = &quot;${pt_r10k_dir}/r10k.yaml&quot; $pt_r10k_file = &quot;${pt_r10k_dir}/r10k.yaml&quot;