+
-
+
+
-
-
-
-
-
-
-
-
@@ -164,6 +129,56 @@ Changelog of Git Changelog.
++
+
+
+
+
+
+
# File 'manifests/params.pp', line 59
@@ -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
diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
index 3999796..b3a1fa6 100644
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
@@ -219,7 +219,24 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
112
113
114
-115
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
# File 'manifests/server/files.pp', line 24
@@ -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
diff --git a/manifests/params.pp b/manifests/params.pp
index 62ea1c6..4f38534 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -116,6 +116,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
diff --git a/manifests/server/files.pp b/manifests/server/files.pp
index e8cd667..d2915cb 100644
--- a/manifests/server/files.pp
+++ b/manifests/server/files.pp
@@ -93,6 +93,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
diff --git a/templates/index_html.erb b/templates/index_html.erb
new file mode 100644
index 0000000..e69de29
diff --git a/tests/UTF_Files b/tests/UTF_Files
index a138597..3dd8a12 100644
--- a/tests/UTF_Files
+++ b/tests/UTF_Files
@@ -2,5 +2,6 @@
./.yardoc/proxy_types: Applesoft BASIC program data
./.yardoc/complete: empty
./.yardoc/objects/root.dat: data
+./templates/index_html.erb: empty
./doc/css/style.css: HTML document, UTF-8 Unicode text, with very long lines
./doc/js/jquery.js: HTML document, UTF-8 Unicode text, with very long lines