rel 15; builds

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

diff --git a/apache1-httpd.conf b/apache1-httpd.conf
index 47ed5948fe6d0848facfaa9b2a8a040003751470..bf3ffc48fa166c1111b4aec501b88eb0fa6f87a3 100644 (file)
--- a/apache1-httpd.conf
+++ b/apache1-httpd.conf
@@ -1,7 +1,6 @@
 ### $Id$
 ###
 ### Main Configuration Section
-### You really shouldn't change these settings unless you're a guru
 ###
 ### This config aims to be clean and readable, you should see
 ### /usr/share/doc/apache1-*/apache.conf.dist.gz for comments on the directives.
@@ -11,11 +10,12 @@ ServerType standalone
 ServerRoot "/etc/apache"
 
 ResourceConfig  /dev/null
-AccessConfig    /dev/null
+AccessConfig   /dev/null
 
 LockFile /var/run/apache.lock
 PidFile /var/run/apache.pid
 ScoreBoardFile /var/run/apache.scoreboard
+CoreDumpDirectory /var/run/apache
 ErrorLog logs/error_log
 LogLevel warn
 
@@ -25,6 +25,7 @@ DefaultType text/plain
 
 HostnameLookups Off
 ServerSignature Email
+#AddDefaultCharset "utf-8"
 
 User  http
 Group http
@@ -33,23 +34,18 @@ Group http
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.
 ServerAdmin root@localhost
-
-#ServerName localhost
-
-# Include other modules and packages config.
-Include conf.d/*.conf
-
+ServerName localhost
 
 ###
 ### IP Address/Port
 ###
 #BindAddress *
-Listen 80
 
 # Listen can take two arguments.
 # (this is an extension for supporting IPv6 addresses)
 #Listen :: 80
 #Listen 0.0.0.0 80
+Listen 80
 
 ###
 ### Performance settings Section
@@ -88,8 +84,54 @@ MaxSpareServers 10
 MaxClients 150
 MaxRequestsPerChild 30
 
+# This controls the directory to which Apache attempts to switch before dumping
+# core. The default is in the ServerRoot directory, however since this should
+# not be writable by the user the server runs as, core dumps won't normally get
+# written. If you want a core dump for debugging, you can use this directive to
+# place it in a different location.
+# Please note that you should also set ulimit coredumpsize to unlimited in
+# /etc/sysconfig/apache for this to have any effect.
+#CoreDumpDirectory /var/tmp
+
 # These lines here are for packages which still use apxs to activate module.
-# LoadModule access_module      modules/mod_access.so
+# LoadModule access_module modules/mod_access.so
 # AddModule mod_foo.c
 
-# vim: filetype=apache ts=4 sw=4 et
+# Include other modules and packages config.
+Include conf.d/*.conf
+# Include webapps config
+Include webapps.d/*.conf
+
+# ScriptAlias: This controls which directories contain server scripts.
+<IfModule mod_alias.c>
+       ScriptAlias /cgi-bin/ "/home/services/apache/cgi-bin/"
+
+       <Directory "/home/services/apache/cgi-bin">
+               AllowOverride None
+               Options None
+               <IfModule mod_access.c>
+                       Order allow,deny
+                       Allow from all
+               </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
+NameVirtualHost 0.0.0.0:80
+<VirtualHost 0.0.0.0: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>
+
+Include vhosts.d/*.conf