- force new openssl version (to avoid runtime errors like undefined symbol: SRP_VBASE...

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

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 66fe37d6eb1bfbd8263ca0c07330caad466773ce..613e5336f58bbab77105281595916f4ee29a4423 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -29,9 +29,9 @@ 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
@@ -59,9 +59,10 @@ MaxKeepAliveRequests 100
 KeepAliveTimeout 5
 UseCanonicalName Off
 AccessFileName .htaccess
-ServerTokens Full
+ServerTokens Prod
 ServerSignature On
 HostnameLookups Off
+#AddDefaultCharset UTF-8
 
 TraceEnable Off
 
@@ -99,10 +100,14 @@ Include webapps.d/*.conf
 # Any apache.conf conf directive may go into a VirtualHost command.
 # See also the BindAddress entry.
 
-#<VirtualHost 1.2.3.4>
-#ServerAdmin webmaster@host.example.com
-#DocumentRoot /www/docs/host.examp-le.com
-#ServerName host.exampl.com
-#ErrorLog logs/host.example.com-error_log
-#TransferLog logs/host.example.com-access_log
-#</VirtualHost>
+# 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