confdroid/confdroid_puppet
3
0
Fork 0
Code Issues Packages Wiki Activity

Merge branch 'jenkins-build-93' into 'master'

Browse Source 
Auto-merge for build 93

See merge request puppet/puppet_cd!89
This commit is contained in:
Jenkins
2025-10-28 12:05:14 +00:00
parent 02c14f9d76 16501ec716
commit f638c9252e
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
View File

@@ -152,7 +152,16 @@
54 54
55 55
56 56
57</pre> 57
58
59
60
61
62
63
64
65
66</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>
@@ -186,7 +195,7 @@ class puppet_cd::main::files (
} }
if $pt_use_puppetdb == true { if $pt_use_puppetdb == true {
# puppetdb.conf # puppetdb
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,
@@ -207,6 +216,15 @@ class puppet_cd::main::files (
notify =&gt; Service[$pt_server_service], notify =&gt; Service[$pt_server_service],
} }
} }
if $pt_use_puppetdb != true {
file { $pt_puppetdb_conf_file:
ensure =&gt; absent,
}
file { $pt_routes_file:
ensure =&gt; absent,
}
}
} }
}</pre> }</pre>
</td> </td>

11
manifests/main/files.pp
View File

@@ -32,7 +32,7 @@ class puppet_cd::main::files (
} }
if $pt_use_puppetdb == true { if $pt_use_puppetdb == true {
# puppetdb.conf # puppetdb
file { $pt_puppetdb_conf_file: file { $pt_puppetdb_conf_file:
ensure => file, ensure => file,
path => $pt_puppetdb_conf_file, path => $pt_puppetdb_conf_file,
@@ -53,5 +53,14 @@ class puppet_cd::main::files (
notify => Service[$pt_server_service], notify => Service[$pt_server_service],
} }
} }
if $pt_use_puppetdb != true {
file { $pt_puppetdb_conf_file:
ensure => absent,
}
file { $pt_routes_file:
ensure => absent,
}
}
} }
} }