Commit 8e7256a6 authored by Joshua Slive's avatar Joshua Slive
Browse files

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
parent 95bd73cd

docs/conf/extra/httpd-userdir.conf

0 → 100644
+28 −0
Original line number Diff line number Diff line 
# 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>

docs/conf/httpd-std.conf.in

+3 −26
Original line number Diff line number Diff line
@@ -362,32 +362,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