summaryrefslogtreecommitdiffstats
path: root/welcome.conf
diff options
context:
space:
mode:
authorJoe Orton <jorton@redhat.com>2012-03-13 09:55:18 +0000
committerJoe Orton <jorton@redhat.com>2012-03-13 09:55:18 +0000
commit3a44ff765502ac564b64b4958239d30e8566dcaf (patch)
tree24433e423b88c4319e138caa4d0e3c94a8458b30 /welcome.conf
parent61679dd90cf1ebd9e9342223ce5344346a9142ce (diff)
downloadhttpd-3a44ff765502ac564b64b4958239d30e8566dcaf.tar.gz
httpd-3a44ff765502ac564b64b4958239d30e8566dcaf.tar.xz
httpd-3a44ff765502ac564b64b4958239d30e8566dcaf.zip
update to 2.4.1
- adopt upstream default httpd.conf (almost verbatim) - split all LoadModules to conf.modules.d/*.conf - include conf.d/*.conf at end of httpd.conf - trim %changelog
Diffstat (limited to 'welcome.conf')
-rw-r--r--welcome.conf17
1 files changed, 12 insertions, 5 deletions
diff --git a/welcome.conf b/welcome.conf
index c1d23c5..5d1e452 100644
--- a/welcome.conf
+++ b/welcome.conf
@@ -1,11 +1,18 @@
#
-# This configuration file enables the default "Welcome"
-# page if there is no default index page present for
-# the root URL. To disable the Welcome page, comment
-# out all the lines below.
+# This configuration file enables the default "Welcome" page if there
+# is no default index page present for the root URL. To disable the
+# Welcome page, comment out all the lines below.
+#
+# NOTE: if this file is removed, it will be restored on upgrades.
#
<LocationMatch "^/+$">
Options -Indexes
- ErrorDocument 403 /error/noindex.html
+ ErrorDocument 403 /.noindex.html
</LocationMatch>
+<Directory /usr/share/httpd/noindex>
+ AllowOverride None
+ Require all granted
+</Directory>
+
+Alias /.noindex.html /usr/share/httpd/noindex/index.html