summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Slive <slive@apache.org>2005-04-02 18:54:47 +0000
committerJoshua Slive <slive@apache.org>2005-04-02 18:54:47 +0000
commit64eaf1df8aa1e64b451e12da985ac38dace2eb77 (patch)
tree074dda32f5aef11e587ee2c4c25e2325dab05b6a
parent849b606235e98e853349c49c0bb036e263a34cb5 (diff)
downloadhttpd-64eaf1df8aa1e64b451e12da985ac38dace2eb77.tar.gz
Move mod_userdir config to extra/.
(The default on UserDir should be changed to disabled so that it won't work without this extra config stuff.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@159792 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/conf/extra/httpd-userdir.conf28
-rw-r--r--docs/conf/httpd-std.conf.in29
2 files changed, 31 insertions, 26 deletions
diff --git a/docs/conf/extra/httpd-userdir.conf b/docs/conf/extra/httpd-userdir.conf
new file mode 100644
index 0000000000..9be34f9200
--- /dev/null
+++ b/docs/conf/extra/httpd-userdir.conf
@@ -0,0 +1,28 @@
+# Settings for user home directories
+#
+# Required module: mod_userdir
+
+#
+# UserDir: The name of the directory that is appended onto a user's home
+# directory if a ~user request is received. Note that you must also set
+# the default access control for these directories, as in the example below.
+#
+UserDir public_html
+
+#
+# Control access to UserDir directories. The following is an example
+# for a site where these directories are restricted to read-only.
+#
+<Directory /home/*/public_html>
+ AllowOverride FileInfo AuthConfig Limit Indexes
+ Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+ <Limit GET POST OPTIONS PROPFIND>
+ Order allow,deny
+ Allow from all
+ </Limit>
+ <LimitExcept GET POST OPTIONS PROPFIND>
+ Order deny,allow
+ Deny from all
+ </LimitExcept>
+</Directory>
+
diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 1c628b4010..0fdd0d8db1 100644
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -363,32 +363,6 @@ DocumentRoot "@exp_htdocsdir@"
</Directory>
#
-# UserDir: The name of the directory that is appended onto a user's home
-# directory if a ~user request is received. Note that you must also set
-# the default access control for these directories, as in the example below.
-#
-<IfModule userdir_module>
- UserDir public_html
-</IfModule>
-
-#
-# Control access to UserDir directories. The following is an example
-# for a site where these directories are restricted to read-only.
-#
-#<Directory /home/*/public_html>
-# AllowOverride FileInfo AuthConfig Limit Indexes
-# Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-# <Limit GET POST OPTIONS PROPFIND>
-# Order allow,deny
-# Allow from all
-# </Limit>
-# <LimitExcept GET POST OPTIONS PROPFIND>
-# Order deny,allow
-# Deny from all
-# </LimitExcept>
-#</Directory>
-
-#
# DirectoryIndex: sets the file that Apache will serve if a directory
# is requested.
#
@@ -807,6 +781,9 @@ ServerSignature On
# Language settings
# Include @relsysconfdir@/extra/httpd-languages.conf
+# User home directories
+# Include @relsysconfdir@/extra/httpd-userdir.conf
+
#
# Secure (SSL/TLS) connections
# Include @rel_sysconfdir@/extra/httpd-ssl.conf