confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

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

Browse Source 
Auto-merge for build 105

See merge request puppet/puppet_cd!101
This commit is contained in:
Jenkins
2025-11-02 14:41:01 +00:00
parent 67e9e1c079 256ba638ff
commit b37e6b689c
2 changed files with 124 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
View File

@@ -187,7 +187,24 @@
89 89
90 90
91 91
92</pre> 92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109</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>
@@ -199,13 +216,17 @@ class puppet_cd::main::files (
if $fqdn != $pt_pm_fqdn { if $fqdn != $pt_pm_fqdn {
file { $pt_puppet_conf_file: file { $pt_puppet_conf_file:
ensure =&gt; file, ensure =&gt; file,
path =&gt; $pt_puppet_conf_file, path =&gt; $pt_puppet_conf_file,
owner =&gt; &#39;root&#39;, owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;, group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;, mode =&gt; &#39;0644&#39;,
content =&gt; template($pt_puppet_conf_erb), selrange =&gt; s0,
notify =&gt; Service[$pt_agent_service], selrole =&gt; object_r,
seltype =&gt; puppet_etc_t,
seluser =&gt; system_u,
content =&gt; template($pt_puppet_conf_erb),
notify =&gt; Service[$pt_agent_service],
} }
if $pt_use_puppetdb == true { if $pt_use_puppetdb == true {
file { $pt_node_rb_file: file { $pt_node_rb_file:
@@ -228,45 +249,58 @@ class puppet_cd::main::files (
if $fqdn == $pt_pm_fqdn { if $fqdn == $pt_pm_fqdn {
file { $pt_puppet_conf_file: file { $pt_puppet_conf_file:
ensure =&gt; file, ensure =&gt; file,
path =&gt; $pt_puppet_conf_file, path =&gt; $pt_puppet_conf_file,
owner =&gt; &#39;root&#39;, owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;, group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;, mode =&gt; &#39;0644&#39;,
content =&gt; template($pt_puppet_conf_erb), selrange =&gt; s0,
notify =&gt; Service[$pt_agent_service,$pt_server_service], selrole =&gt; object_r,
seltype =&gt; puppet_etc_t,
seluser =&gt; system_u,
content =&gt; template($pt_puppet_conf_erb),
notify =&gt; Service[$pt_agent_service,$pt_server_service],
} }
if $pt_use_puppetdb == true { if $pt_use_puppetdb == true {
# puppetdb # 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,
owner =&gt; &#39;root&#39;, owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;, group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;, mode =&gt; &#39;0644&#39;,
content =&gt; template($pt_puppetdb_conf_erb), selrange =&gt; s0,
notify =&gt; Service[$pt_agent_service,$pt_server_service], selrole =&gt; object_r,
seltype =&gt; puppet_etc_t,
seluser =&gt; system_u,
content =&gt; template($pt_puppetdb_conf_erb),
notify =&gt; Service[$pt_agent_service,$pt_server_service],
} }
# routes.yaml # routes.yaml
file { $pt_routes_file: file { $pt_routes_file:
ensure =&gt; file, ensure =&gt; file,
path =&gt; $pt_routes_file, path =&gt; $pt_routes_file,
owner =&gt; &#39;root&#39;, owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;, group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;, mode =&gt; &#39;0644&#39;,
content =&gt; template($pt_routes_erb), selrange =&gt; s0,
notify =&gt; Service[$pt_server_service], selrole =&gt; object_r,
seltype =&gt; puppet_etc_t,
seluser =&gt; system_u,
content =&gt; template($pt_routes_erb),
notify =&gt; Service[$pt_server_service],
} }
file { $pt_node_rb_file: file { $pt_node_rb_file:
ensure =&gt; file, ensure =&gt; file,
owner =&gt; &#39;puppet&#39;, owner =&gt; &#39;puppet&#39;,
group =&gt; &#39;puppet&#39;, group =&gt; &#39;puppet&#39;,
mode =&gt; &#39;0550&#39;, mode =&gt; &#39;0550&#39;,
selrole =&gt; object_r, selrange =&gt; s0,
seltype =&gt; foreman_enc_t, selrole =&gt; object_r,
seluser =&gt; system_u, seltype =&gt; foreman_enc_t,
content =&gt; template($pt_node_rb_erb), seluser =&gt; system_u,
content =&gt; template($pt_node_rb_erb),
} }
} }
if $pt_use_puppetdb != true { if $pt_use_puppetdb != true {

89
manifests/main/files.pp
View File

@@ -10,13 +10,17 @@ class puppet_cd::main::files (
if $fqdn != $pt_pm_fqdn { if $fqdn != $pt_pm_fqdn {
file { $pt_puppet_conf_file: file { $pt_puppet_conf_file:
ensure => file, ensure => file,
path => $pt_puppet_conf_file, path => $pt_puppet_conf_file,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
content => template($pt_puppet_conf_erb), selrange => s0,
notify => Service[$pt_agent_service], selrole => object_r,
seltype => puppet_etc_t,
seluser => system_u,
content => template($pt_puppet_conf_erb),
notify => Service[$pt_agent_service],
} }
if $pt_use_puppetdb == true { if $pt_use_puppetdb == true {
file { $pt_node_rb_file: file { $pt_node_rb_file:
@@ -39,45 +43,58 @@ class puppet_cd::main::files (
if $fqdn == $pt_pm_fqdn { if $fqdn == $pt_pm_fqdn {
file { $pt_puppet_conf_file: file { $pt_puppet_conf_file:
ensure => file, ensure => file,
path => $pt_puppet_conf_file, path => $pt_puppet_conf_file,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
content => template($pt_puppet_conf_erb), selrange => s0,
notify => Service[$pt_agent_service,$pt_server_service], selrole => object_r,
seltype => puppet_etc_t,
seluser => system_u,
content => template($pt_puppet_conf_erb),
notify => Service[$pt_agent_service,$pt_server_service],
} }
if $pt_use_puppetdb == true { if $pt_use_puppetdb == true {
# puppetdb # 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,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
content => template($pt_puppetdb_conf_erb), selrange => s0,
notify => Service[$pt_agent_service,$pt_server_service], selrole => object_r,
seltype => puppet_etc_t,
seluser => system_u,
content => template($pt_puppetdb_conf_erb),
notify => Service[$pt_agent_service,$pt_server_service],
} }
# routes.yaml # routes.yaml
file { $pt_routes_file: file { $pt_routes_file:
ensure => file, ensure => file,
path => $pt_routes_file, path => $pt_routes_file,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
content => template($pt_routes_erb), selrange => s0,
notify => Service[$pt_server_service], selrole => object_r,
seltype => puppet_etc_t,
seluser => system_u,
content => template($pt_routes_erb),
notify => Service[$pt_server_service],
} }
file { $pt_node_rb_file: file { $pt_node_rb_file:
ensure => file, ensure => file,
owner => 'puppet', owner => 'puppet',
group => 'puppet', group => 'puppet',
mode => '0550', mode => '0550',
selrole => object_r, selrange => s0,
seltype => foreman_enc_t, selrole => object_r,
seluser => system_u, seltype => foreman_enc_t,
content => template($pt_node_rb_erb), seluser => system_u,
content => template($pt_node_rb_erb),
} }
} }
if $pt_use_puppetdb != true { if $pt_use_puppetdb != true {