rel 15; builds

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

diff --git a/apache1-httpd.conf b/apache1-httpd.conf
index 0de5cb93ecfd1ffc61f9d070e90b6aa7ec1a0e67..bf3ffc48fa166c1111b4aec501b88eb0fa6f87a3 100644 (file)
--- a/apache1-httpd.conf
+++ b/apache1-httpd.conf
@@ -25,6 +25,7 @@ DefaultType text/plain
 
 HostnameLookups Off
 ServerSignature Email
+#AddDefaultCharset "utf-8"
 
 User  http
 Group http
@@ -39,12 +40,12 @@ 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
@@ -83,6 +84,15 @@ 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
 # AddModule mod_foo.c
@@ -99,7 +109,29 @@ Include webapps.d/*.conf
        <Directory "/home/services/apache/cgi-bin">
                AllowOverride None
                Options None
-               Order allow,deny
-               Allow from all
+               <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