From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 4 Nov 2009 11:38:57 +0000 (+0000)
Subject: - virtualhost has nothing to do with mod_vhost_alias module. it is in core
X-Git-Tag: auto/th/apache-2_2_14-8~5
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache.git;a=commitdiff_plain;h=a6f9c2c2055b15346714044f30fe9c89266f0f27

- virtualhost has nothing to do with mod_vhost_alias module. it is in core

Changed files:
    apache-httpd.conf -> 1.50
    apache-mod_vhost_alias.conf -> 1.6
---

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 37b7942..66fe37d 100644
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -90,3 +90,19 @@ Include webapps.d/*.conf
 		</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.
+
+#<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>
diff --git a/apache-mod_vhost_alias.conf b/apache-mod_vhost_alias.conf
index e780480..5c298f6 100644
--- a/apache-mod_vhost_alias.conf
+++ b/apache-mod_vhost_alias.conf
@@ -3,20 +3,4 @@ LoadModule vhost_alias_module   modules/mod_vhost_alias.so
 
 <IfModule mod_vhost_alias.c>
 
-# 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 httpd.conf or srm.conf directive may go into a VirtualHost command.
-# See also the BindAddress entry.
- 
-#<VirtualHost host.some_domain.com>
-#ServerAdmin webmaster@host.some_domain.com
-#DocumentRoot /www/docs/host.some_domain.com
-#ServerName host.some_domain.com
-#ErrorLog logs/host.some_domain.com-error_log
-#TransferLog logs/host.some_domain.com-access_log
-#</VirtualHost>
-
 </IfModule>