3
0

Recommit for updates in build 104

This commit is contained in:
2025-11-01 17:35:47 +01:00
parent 5380ba36ac
commit 29fbfa2f8c
6 changed files with 159 additions and 121 deletions

View File

@@ -77,6 +77,10 @@
<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_3Afirewall_3A_3Aiptables.html" title="puppet_classes::puppet_cd::firewall::iptables (puppet_class)">puppet_cd::firewall::iptables</a></span><br/>
@@ -1231,7 +1235,27 @@
181
182
183
184</pre>
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 64</span>
@@ -1307,10 +1331,10 @@ class puppet_cd::params (
) {
# facts
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
$domain = $facts[&#39;networking&#39;][&#39;domain&#39;]
$os_name = $facts[&#39;os&#39;][&#39;name&#39;]
$os_release = $facts[&#39;os&#39;][&#39;release&#39;][&#39;major&#39;]
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
$domain = $facts[&#39;networking&#39;][&#39;domain&#39;]
$os_name = $facts[&#39;os&#39;][&#39;name&#39;]
$os_release = $facts[&#39;os&#39;][&#39;release&#39;][&#39;major&#39;]
# directories
## puppet
@@ -1324,10 +1348,12 @@ 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;
## r10k
$pt_r10k_dir = &quot;${pt_main_dir}/r10k&quot;
$pt_r10k_webhook_dir = &#39;/etc/r10k-webhook&#39;
## puppetdb
$pt_puppetdb_dir = &#39;/etc/puppetlabs/puppetdb&#39;
$pt_puppetdb_conf_dir = &quot;${pt_puppetdb_dir}/conf.d&quot;
# files
## puppet
@@ -1340,13 +1366,31 @@ class puppet_cd::params (
$pt_routes_erb = &#39;puppet_cd/puppetdb/routes.yaml.erb&#39;
$pt_node_rb_file = &quot;${pt_puppetdir}/node.rb&quot;
$pt_node_rb_erb = &#39;puppet_cd/puppetdb/node.rb.erb&#39;
## r10k
$pt_r10k_file = &quot;${pt_r10k_dir}/r10k.yaml&quot;
$pt_r10k_erb = &#39;puppet_cd/r10k/r10k.yaml.erb&#39;
$pt_webhook_link = &#39;ln -sf /usr/local/share/gems/gems/r10k_gitlab_webhook-0.1.3/bin/r10k_gitlab_webhook /usr/bin/&#39;
$pt_webhook_service_file = &#39;/etc/systemd/system/r10k_gitlab_webhook.service&#39;
$pt_webhook_service_erb = &#39;puppet_cd/r10k/r10k_webhook_service.erb&#39;
## puppetdb
$pt_bootstrap_conf_file = &quot;${pt_puppetdb_dir}/bootstrap.cfg&quot;
$pt_bootstrap_conf_erb = &#39;puppet_cd/puppetdb/bootstrap.cfg.erb&#39;
$pt_logback_conf_file = &quot;${pt_puppetdb_dir}/logback.xml&quot;
$pt_logback_conf_erb = &#39;puppet_cd/puppetdb/logback.xml.erb&#39;
$pt_logging_conf_file = &quot;${pt_puppetdb_dir}/request-logging.xml&quot;
$pt_logging_conf_erb = &#39;puppet_cd/puppetdb/request_logging.xml.erb&#39;
$pt_auth_conf_file = &quot;${pt_puppetdb_conf_dir}/auth.conf&quot;
$pt_auth_conf_erb = &#39;puppet_cd/puppetdb/auth.conf.erb&#39;
$pt_config_ini_file = &quot;${pt_puppetdb_conf_dir}/config.ini&quot;
$pt_config_ini_erb = &#39;puppet_cd/puppetdb/config.ini.erb&#39;
$pt_db_ini_file = &quot;${pt_puppetdb_conf_dir}/database.ini&quot;
$pt_db_ini_erb = &#39;puppet_cd/puppetdb/database.ini.erb&#39;
$pt_jetty_ini_file = &quot;${pt_puppetdb_conf_dir}/jetty.ini&quot;
$pt_jetty_ini_erb = &#39;puppet_cd/puppetdb/jetty.ini.erb&#39;
$pt_repl_ini_file = &quot;${pt_puppetdb_conf_dir}/repl.ini&quot;
$pt_repl_ini_erb = &#39;puppet_cd/puppetdb/repl.ini.erb&#39;
$pt_service_conf_file = &#39;/usr/lib/systemd/system/puppetdb.service&#39;
$pt_service_conf_erb = &#39;puppet_cd/puppetdb/service.conf.erb&#39;
# service
$pt_server_service = &#39;puppetserver&#39;