recommit for updates in build 5

This commit is contained in:
2018-04-20 10:32:51 +02:00
parent daa771bb0a
commit 3e4c6a15e5
5 changed files with 117 additions and 61 deletions

View File

@@ -488,7 +488,9 @@ disabled.</p>
121
122
123
124</pre>
124
125
126</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 59</span>
@@ -553,6 +555,8 @@ $ae_autoindex_file = &quot;${ae_conf_d_dir}/autoindex.conf&quot;
$ae_autoindex_erb = &#39;cd_apache/autoindex_conf.erb&#39;
$ae_userdir_file = &quot;${ae_conf_d_dir}/userdir.conf&quot;
$ae_userdir_erb = &#39;cd_apache/userdir_conf.erb&#39;
$ae_index_file = &#39;/var/www/html/index.html&#39;
$ae_index_erb = &#39;cd_apache/index_html.erb&#39;
# includes must be last

View File

@@ -219,7 +219,24 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
112
113
114
115</pre>
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 24</span>
@@ -296,6 +313,23 @@ class cd_apache::server::files (
notify =&gt; Service[&#39;httpd&#39;],
}
# manage index.html
file { $ae_index_file:
ensure =&gt; file,
path =&gt; $ae_index_file,
owner =&gt; $ae_user_name,
group =&gt; $ae_user_name,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; httpd_sys_content_t,
seluser =&gt; system_u,
content =&gt; template($ae_index_erb),
notify =&gt; Service[&#39;httpd&#39;],
}
if $ae_allow_user_dirs == true {
# manage userdir.conf