Merge branch 'jenkins-build-105' into 'master'
Auto-merge for build 105 See merge request puppet/puppet_cd!101
This commit is contained in:
@@ -187,7 +187,24 @@
|
||||
89
|
||||
90
|
||||
91
|
||||
92</pre>
|
||||
92
|
||||
93
|
||||
94
|
||||
95
|
||||
96
|
||||
97
|
||||
98
|
||||
99
|
||||
100
|
||||
101
|
||||
102
|
||||
103
|
||||
104
|
||||
105
|
||||
106
|
||||
107
|
||||
108
|
||||
109</pre>
|
||||
</td>
|
||||
<td>
|
||||
<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 => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => puppet_etc_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_puppet_conf_erb),
|
||||
notify => Service[$pt_agent_service],
|
||||
}
|
||||
@@ -233,6 +254,10 @@ class puppet_cd::main::files (
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => puppet_etc_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_puppet_conf_erb),
|
||||
notify => Service[$pt_agent_service,$pt_server_service],
|
||||
}
|
||||
@@ -245,6 +270,10 @@ class puppet_cd::main::files (
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => puppet_etc_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_puppetdb_conf_erb),
|
||||
notify => Service[$pt_agent_service,$pt_server_service],
|
||||
}
|
||||
@@ -255,6 +284,10 @@ class puppet_cd::main::files (
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => puppet_etc_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_routes_erb),
|
||||
notify => Service[$pt_server_service],
|
||||
}
|
||||
@@ -263,6 +296,7 @@ class puppet_cd::main::files (
|
||||
owner => 'puppet',
|
||||
group => 'puppet',
|
||||
mode => '0550',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => foreman_enc_t,
|
||||
seluser => system_u,
|
||||
|
||||
@@ -15,6 +15,10 @@ class puppet_cd::main::files (
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => puppet_etc_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_puppet_conf_erb),
|
||||
notify => Service[$pt_agent_service],
|
||||
}
|
||||
@@ -44,6 +48,10 @@ class puppet_cd::main::files (
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => puppet_etc_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_puppet_conf_erb),
|
||||
notify => Service[$pt_agent_service,$pt_server_service],
|
||||
}
|
||||
@@ -56,6 +64,10 @@ class puppet_cd::main::files (
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => puppet_etc_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_puppetdb_conf_erb),
|
||||
notify => Service[$pt_agent_service,$pt_server_service],
|
||||
}
|
||||
@@ -66,6 +78,10 @@ class puppet_cd::main::files (
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => puppet_etc_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_routes_erb),
|
||||
notify => Service[$pt_server_service],
|
||||
}
|
||||
@@ -74,6 +90,7 @@ class puppet_cd::main::files (
|
||||
owner => 'puppet',
|
||||
group => 'puppet',
|
||||
mode => '0550',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => foreman_enc_t,
|
||||
seluser => system_u,
|
||||
|
||||
Reference in New Issue
Block a user