X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-httpd.conf;h=e28647d03754c7bd19353243ffe3628608d1dc3d;hb=9d54f7b0e3d34e771ef1949a03902ee2e87d7230;hp=98bd2995e33e24abda5394b9b34fb88f7fb1d4cc;hpb=80da5b98b7065c35ddd1e968ff99637f9c29c473;p=packages%2Fapache.git

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 98bd299..e28647d 100644
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -62,6 +62,7 @@ AccessFileName .htaccess
 ServerTokens Full
 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