696614c16d
- Allow access to /home if mod_userdir is loaded - We don't need apache2libs.sh if apr is installed from ports. - Add recent changes to UPGRADING
118 lines
3.3 KiB
Text
118 lines
3.3 KiB
Text
--- docs/conf/httpd-std.conf.in.orig Sat Apr 24 20:13:43 2004
|
|
+++ docs/conf/httpd-std.conf.in Tue Aug 17 12:11:17 2004
|
|
@@ -68,7 +68,7 @@
|
|
#
|
|
<IfModule !mpm_netware.c>
|
|
<IfModule !perchild.c>
|
|
-#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
|
|
+#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
|
|
</IfModule>
|
|
</IfModule>
|
|
|
|
@@ -265,8 +265,8 @@
|
|
# when the value of (unsigned)Group is above 60000;
|
|
# don't use Group #-1 on these systems!
|
|
#
|
|
-User nobody
|
|
-Group #-1
|
|
+User www
|
|
+Group www
|
|
</IfModule>
|
|
</IfModule>
|
|
|
|
@@ -314,10 +314,11 @@
|
|
#
|
|
# First, we configure the "default" to be a very restrictive set of
|
|
# features.
|
|
-#
|
|
+#
|
|
<Directory />
|
|
- Options FollowSymLinks
|
|
AllowOverride None
|
|
+ Order Deny,Allow
|
|
+ Deny from all
|
|
</Directory>
|
|
|
|
#
|
|
@@ -365,24 +366,29 @@
|
|
# UserDir: The name of the directory that is appended onto a user's home
|
|
# directory if a ~user request is received.
|
|
#
|
|
+<IfModule mod_userdir.c>
|
|
UserDir public_html
|
|
|
|
+UserDir disabled %%FTPUSERS%%
|
|
+
|
|
#
|
|
# 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>
|
|
+
|
|
+</IfModule>
|
|
|
|
#
|
|
# DirectoryIndex: sets the file that Apache will serve if a directory
|
|
@@ -472,7 +478,7 @@
|
|
# logged here. If you *do* define an error logfile for a <VirtualHost>
|
|
# container, that host's errors will be logged there and not here.
|
|
#
|
|
-ErrorLog @rel_logfiledir@/error_log
|
|
+ErrorLog @rel_logfiledir@/httpd-error.log
|
|
|
|
#
|
|
# LogLevel: Control the number of messages logged to the error_log.
|
|
@@ -500,20 +506,20 @@
|
|
# define per-<VirtualHost> access logfiles, transactions will be
|
|
# logged therein and *not* in this file.
|
|
#
|
|
-CustomLog @rel_logfiledir@/access_log common
|
|
+#CustomLog @rel_logfiledir@/httpd-access.log common
|
|
|
|
#
|
|
# If you would like to have agent and referer logfiles, uncomment the
|
|
# following directives.
|
|
#
|
|
-#CustomLog @rel_logfiledir@/referer_log referer
|
|
-#CustomLog @rel_logfiledir@/agent_log agent
|
|
+#CustomLog @rel_logfiledir@/httpd-referer.log referer
|
|
+#CustomLog @rel_logfiledir@/httpd-agent.log agent
|
|
|
|
#
|
|
# If you prefer a single logfile with access, agent, and referer information
|
|
# (Combined Logfile Format) you can use the following directive.
|
|
#
|
|
-#CustomLog @rel_logfiledir@/access_log combined
|
|
+CustomLog @rel_logfiledir@/httpd-access.log combined
|
|
|
|
#
|
|
# ServerTokens
|
|
@@ -1049,3 +1055,5 @@
|
|
# ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
|
|
# CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
|
|
#</VirtualHost>
|
|
+
|
|
+Include @rel_sysconfdir@/Includes/*.conf
|