- Vary on User-Agent is insame, Vary on Accept-Encoding instead, also decaces old...

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

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 3dbecbd6ccd39f8d08fa0f954094d060056c9a30..e28647d03754c7bd19353243ffe3628608d1dc3d 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -22,16 +22,16 @@ Group http
 # ports, instead of the default. See also the <VirtualHost>
 # directive.
 #
-# Change this to Listen on specific IP addresses as shown below t
+# Change this to Listen on specific IP addresses as shown below to
 # prevent Apache from glomming onto all bound IP addresses.
 #Listen 192.168.1.1:80
 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
@@ -39,7 +39,7 @@ ServerAdmin you@example.com
 #
 # If your host doesn't have a registered DNS name, enter its IP address here.
 #
-#ServerName www.example.com:80
+ServerName localhost
 
 # ErrorLog: The location of the error log file.
 # If you do not specify an ErrorLog directive within a <VirtualHost>
@@ -62,12 +62,52 @@ AccessFileName .htaccess
 ServerTokens Full
 ServerSignature On
 HostnameLookups Off
+#AddDefaultCharset UTF-8
+
+TraceEnable Off
 
 # Include other modules and packages config.
-# TODO: use conf.d here oneday
-Include httpd.conf/*.conf
+Include conf.d/*.conf
 
 # Include webapps config
 Include webapps.d/*.conf
 
-# vim:syn=apache
+<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>
+                       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 *:80
+<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>
+
+Include vhosts.d/*.conf