- update to 1.3.39,

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

diff --git a/apache1-httpd.conf b/apache1-httpd.conf
index 17fa1476b16734ee17f3634ab6ede79b1809f0a1..0de5cb93ecfd1ffc61f9d070e90b6aa7ec1a0e67 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
 
@@ -35,10 +35,6 @@ Group http
 ServerAdmin root@localhost
 ServerName localhost
 
-# Include other modules and packages config.
-Include conf.d/*.conf
-
-
 ###
 ### IP Address/Port
 ###
@@ -88,7 +84,22 @@ MaxClients 150
 MaxRequestsPerChild 30
 
 # 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
+               Order allow,deny
+               Allow from all
+       </Directory>
+</IfModule>