- webserver(virtual) provides renamed to be shorter and less confusing

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

diff --git a/apache1-httpd.conf b/apache1-httpd.conf
index 3671f16f44caedd2fa4522d7aeac0aed1528c816..670ef94eb2ad2f56d84de115eda5dd315f4f6e80 100644 (file)
--- a/apache1-httpd.conf
+++ b/apache1-httpd.conf
@@ -4,19 +4,19 @@
 ### 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-*/httpd.conf* for comments on the directives.
+### /usr/share/doc/apache1-*/apache.conf.dist.gz for comments on the directives.
 ###
 
 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
-ErrorLog /var/log/apache/error_log
+ErrorLog logs/error_log
 LogLevel warn
 
 AccessFileName .htaccess
@@ -33,12 +33,7 @@ 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
@@ -46,6 +41,11 @@ Include conf.d/*.conf
 #BindAddress *
 Listen 80
 
+# Listen can take two arguments.
+# (this is an extension for supporting IPv6 addresses)
+#Listen :: 80
+#Listen 0.0.0.0 80
+
 ###
 ### Performance settings Section
 ###
@@ -84,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>