- rel 4; make sure -n isn't true when MPM is empty

[packages/apache.git] / apache-httpd.conf

diff --git a/apache-httpd.conf b/apache-httpd.conf
index ac0f8ff4557c3c84f1cd01b24c8730099bd4e181..28199f7fd7a4861baf92015000102ffe5fb0f1a6 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -1,5 +1,3 @@
-# $Id$
-#
 # This is the main Apache HTTP server configuration file.
 # It contains the configuration directives that give the server its instructions.
 #
@@ -10,7 +8,9 @@
 # for a discussion of each configuration directive.
 
 ServerRoot "/etc/httpd"
-DefaultType text/plain
+
+LoadModule unixd_module   modules/mod_unixd.so
+
 
 # User/Group: The name (or #number) of the user/group to run httpd as.
 # It is usually good practice to create a dedicated user and group for
@@ -29,9 +29,9 @@ Listen 80
 
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.  This address appears on some server-generated pages, such
-# as error documents.  e.g. admin@your-domain.com
+# as error documents.  e.g. admin@example.com
 #
-ServerAdmin you@example.com
+ServerAdmin root@example.com
 
 # ServerName gives the name and port that the server uses to identify itself.
 # This can often be determined automatically, but we recommend you specify
@@ -53,20 +53,74 @@ ErrorLog logs/error_log
 # alert, emerg.
 LogLevel warn
 
-Timeout 300
+Timeout 60
 KeepAlive On
 MaxKeepAliveRequests 100
 KeepAliveTimeout 5
 UseCanonicalName Off
 AccessFileName .htaccess
-ServerTokens Full
+ServerTokens Prod
 ServerSignature On
 HostnameLookups Off
+#AddDefaultCharset UTF-8
+
+TraceEnable Off
 
 # Include other modules and packages config.
-Include conf.d/*.conf
+IncludeOptional conf.d/*.conf
 
 # Include webapps config
-Include webapps.d/*.conf
+IncludeOptional webapps.d/*.conf
+
+#
+# Set a timeout for how long the client may take to send the request header
+# and body.
+# The default for the headers is header=20-40,MinRate=500, which means wait
+# for the first byte of headers for 20 seconds. If some data arrives,
+# increase the timeout corresponding to a data rate of 500 bytes/s, but not
+# above 40 seconds.
+# The default for the request body is body=20,MinRate=500, which is the same
+# but has no upper limit for the timeout.
+# To disable, set to header=0 body=0
+#
+<IfModule reqtimeout_module>
+  RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500
+</IfModule>
+
+<IfModule alias_module>
+       # ScriptAlias: This controls which directories contain server scripts.
+       # ScriptAliases are essentially the same as Aliases, except that
+       # documents in the target directory are treated as applications and
+       # run by the server when requested rather than as documents sent to the
+       # client.  The same rules about trailing "/" apply to ScriptAlias
+       # directives as to Alias.
+       #
+       ScriptAlias /cgi-bin/ "/home/services/httpd/cgi-bin/"
+
+       <Directory "/home/services/httpd/cgi-bin">
+               AllowOverride None
+               Options None
+               <IfModule mod_authz_host.c>
+                       Require all granted
+               </IfModule>
+       </Directory>
+</IfModule>
+
+# VirtualHost: Allows the daemon to respond to requests for more than one
+# server address, if your server machine is configured to accept IP packets
+# for multiple addresses. This can be accomplished with the ifconfig
+# alias flag, or through kernel patches like VIF.
+
+# Any apache.conf conf directive may go into a VirtualHost command.
+# See also the BindAddress entry.
+
+# Setup default vhost (first one defined in config) and include vhosts configuration
+<VirtualHost *:80>
+    ServerName localhost
+#      ServerAdmin webmaster@host.example.com
+#      DocumentRoot /www/docs/host.example.com
+#      ErrorLog logs/host.example.com-error_log
+#      TransferLog logs/host.example.com-access_log
+</VirtualHost>
 
-# vim:syn=apache
+IncludeOptional vhosts.d/*.conf