summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--1.3/conf/httpd.conf29
-rw-r--r--2.0/conf/httpd.conf32
2 files changed, 33 insertions, 28 deletions
diff --git a/1.3/conf/httpd.conf b/1.3/conf/httpd.conf
index a58eea9..7929e90 100644
--- a/1.3/conf/httpd.conf
+++ b/1.3/conf/httpd.conf
@@ -430,25 +430,24 @@ ServerAdmin root@localhost
#
<IfModule mod_userdir.c>
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
-# 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>
-#
+ <Directory /home/*/public_html>
+ AllowOverride FileInfo AuthConfig Limit
+ 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>
+
# Enable this additional section if you would like to make use of
# suexec-enabled cgi-bin directory on a per-user basis. Note that it must
# stay under public_html for it to work with suexec.
@@ -458,6 +457,8 @@ ServerAdmin root@localhost
# SetHandler cgi-script
#</Directory>
+</IfModule>
+
#
# DirectoryIndex: Name of the file or files to use as a pre-written HTML
diff --git a/2.0/conf/httpd.conf b/2.0/conf/httpd.conf
index 7dd9363..3654938 100644
--- a/2.0/conf/httpd.conf
+++ b/2.0/conf/httpd.conf
@@ -423,28 +423,29 @@ UseCanonicalName Off
#
# UserDir: The name of the directory that is appended onto a user's home
# directory if a ~user request is received.
+# enable by adding -D USERDIR to /etc/conf.d/apache2
#
<IfModule mod_userdir.c>
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>
-#
+ <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>
+
+
# Enable this additional section if you would like to make use of a
# suexec-enabled cgi-bin directory on a per-user basis.
#
@@ -453,6 +454,9 @@ UseCanonicalName Off
# SetHandler cgi-script
#</Directory>
+</IfModule>
+
+
#
# DirectoryIndex: sets the file that Apache will serve if a directory
# is requested.