From: William A. Rowe Jr <wrowe@apache.org>
Date: Sat, 29 Dec 2007 03:29:03 +0000 (+0000)
Subject: Provide vhosts examples remotely related to the httpd.conf we create?
X-Git-Tag: 2.2.7~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8bc08a0f3679b5f60bb65c9b13eae1f8bf37eca;p=thirdparty%2Fapache%2Fhttpd.git

Provide vhosts examples remotely related to the httpd.conf we create?

This patch was leapfrogged by a backport of 515403, if you
are confused by the sequence.

Backport: r410762

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@607366 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/conf/extra/httpd-vhosts.conf.in b/docs/conf/extra/httpd-vhosts.conf.in
index 6beb5728abd..fb44a16781d 100644
--- a/docs/conf/extra/httpd-vhosts.conf.in
+++ b/docs/conf/extra/httpd-vhosts.conf.in
@@ -16,7 +16,7 @@
 #
 # Use name-based virtual hosting.
 #
-NameVirtualHost *:80
+NameVirtualHost *:@@Port@@
 
 #
 # VirtualHost example:
@@ -24,18 +24,18 @@ NameVirtualHost *:80
 # The first VirtualHost section is used for all requests that do not
 # match a ServerName or ServerAlias in any <VirtualHost> block.
 #
-<VirtualHost *:80>
+<VirtualHost *:@@Port@@>
     ServerAdmin webmaster@dummy-host.example.com
-    DocumentRoot "/www/docs/dummy-host.example.com"
+    DocumentRoot "@@ServerRoot@@/docs/dummy-host.example.com"
     ServerName dummy-host.example.com
     ServerAlias www.dummy-host.example.com
     ErrorLog "@rel_logfiledir@/dummy-host.example.com-error_log"
     CustomLog "@rel_logfiledir@/dummy-host.example.com-access_log" common
 </VirtualHost>
 
-<VirtualHost *:80>
+<VirtualHost *:@@Port@@>
     ServerAdmin webmaster@dummy-host2.example.com
-    DocumentRoot "/www/docs/dummy-host2.example.com"
+    DocumentRoot "@@ServerRoot@@/docs/dummy-host2.example.com"
     ServerName dummy-host2.example.com
     ErrorLog "@rel_logfiledir@/dummy-host2.example.com-error_log"
     CustomLog "@rel_logfiledir@/dummy-host2.example.com-access_log" common