recommit for updates in build 5
This commit is contained in:
@@ -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 = "${ae_conf_d_dir}/autoindex.conf"
|
||||
$ae_autoindex_erb = 'cd_apache/autoindex_conf.erb'
|
||||
$ae_userdir_file = "${ae_conf_d_dir}/userdir.conf"
|
||||
$ae_userdir_erb = 'cd_apache/userdir_conf.erb'
|
||||
$ae_index_file = '/var/www/html/index.html'
|
||||
$ae_index_erb = 'cd_apache/index_html.erb'
|
||||
|
||||
# includes must be last
|
||||
|
||||
|
||||
@@ -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 => Service['httpd'],
|
||||
}
|
||||
|
||||
# manage index.html
|
||||
|
||||
file { $ae_index_file:
|
||||
ensure => file,
|
||||
path => $ae_index_file,
|
||||
owner => $ae_user_name,
|
||||
group => $ae_user_name,
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => httpd_sys_content_t,
|
||||
seluser => system_u,
|
||||
content => template($ae_index_erb),
|
||||
notify => Service['httpd'],
|
||||
}
|
||||
|
||||
|
||||
if $ae_allow_user_dirs == true {
|
||||
|
||||
# manage userdir.conf
|
||||
|
||||
Reference in New Issue
Block a user