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

36
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>
@@ -204,6 +221,10 @@ class puppet_cd::main::files (
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;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; puppet_etc_t,
seluser =&gt; system_u,
content =&gt; template($pt_puppet_conf_erb), content =&gt; template($pt_puppet_conf_erb),
notify =&gt; Service[$pt_agent_service], notify =&gt; Service[$pt_agent_service],
} }
@@ -233,6 +254,10 @@ class puppet_cd::main::files (
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;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; puppet_etc_t,
seluser =&gt; system_u,
content =&gt; template($pt_puppet_conf_erb), content =&gt; template($pt_puppet_conf_erb),
notify =&gt; Service[$pt_agent_service,$pt_server_service], notify =&gt; Service[$pt_agent_service,$pt_server_service],
} }
@@ -245,6 +270,10 @@ class puppet_cd::main::files (
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;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; puppet_etc_t,
seluser =&gt; system_u,
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],
} }
@@ -255,6 +284,10 @@ class puppet_cd::main::files (
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;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; puppet_etc_t,
seluser =&gt; system_u,
content =&gt; template($pt_routes_erb), content =&gt; template($pt_routes_erb),
notify =&gt; Service[$pt_server_service], notify =&gt; Service[$pt_server_service],
} }
@@ -263,6 +296,7 @@ class puppet_cd::main::files (
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;,
selrange =&gt; s0,
selrole =&gt; object_r, selrole =&gt; object_r,
seltype =&gt; foreman_enc_t, seltype =&gt; foreman_enc_t,
seluser =&gt; system_u, seluser =&gt; system_u,

17
manifests/main/files.pp
View File

@@ -15,6 +15,10 @@ class puppet_cd::main::files (
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
selrange => s0,
selrole => object_r,
seltype => puppet_etc_t,
seluser => system_u,
content => template($pt_puppet_conf_erb), content => template($pt_puppet_conf_erb),
notify => Service[$pt_agent_service], notify => Service[$pt_agent_service],
} }
@@ -44,6 +48,10 @@ class puppet_cd::main::files (
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
selrange => s0,
selrole => object_r,
seltype => puppet_etc_t,
seluser => system_u,
content => template($pt_puppet_conf_erb), content => template($pt_puppet_conf_erb),
notify => Service[$pt_agent_service,$pt_server_service], notify => Service[$pt_agent_service,$pt_server_service],
} }
@@ -56,6 +64,10 @@ class puppet_cd::main::files (
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
selrange => s0,
selrole => object_r,
seltype => puppet_etc_t,
seluser => system_u,
content => template($pt_puppetdb_conf_erb), content => template($pt_puppetdb_conf_erb),
notify => Service[$pt_agent_service,$pt_server_service], notify => Service[$pt_agent_service,$pt_server_service],
} }
@@ -66,6 +78,10 @@ class puppet_cd::main::files (
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
selrange => s0,
selrole => object_r,
seltype => puppet_etc_t,
seluser => system_u,
content => template($pt_routes_erb), content => template($pt_routes_erb),
notify => Service[$pt_server_service], notify => Service[$pt_server_service],
} }
@@ -74,6 +90,7 @@ class puppet_cd::main::files (
owner => 'puppet', owner => 'puppet',
group => 'puppet', group => 'puppet',
mode => '0550', mode => '0550',
selrange => s0,
selrole => object_r, selrole => object_r,
seltype => foreman_enc_t, seltype => foreman_enc_t,
seluser => system_u, seluser => system_u,