ispman/install-data/templates vhost.ldif.template,1.9,1.10 vhosts.conf.template,1.17,1.18

Update of /cvsroot/ispman/ispman/install-data/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24249/install-data/templates

Modified Files:
	vhost.ldif.template vhosts.conf.template 
Log Message:
multi-port vhost patch
(use "vhost:port" for multiple vhost with same name but different ports)
fixes [ 987800 ] Port 80 is written to DNS zone


Index: vhost.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/vhost.ldif.template,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- vhost.ldif.template	4 Jul 2004 18:05:17 -0000	1.9
+++ vhost.ldif.template	9 Jul 2004 22:19:13 -0000	1.10
@@ -7,13 +7,14 @@
 }
 $text
 </perl>
+<perl>($vhost,$port) = split ":",$r->param("ispmanVhostName");""</perl>
 
 ispmanVhostName: <perl>$r->param("ispmanVhostName")</perl>
-cn: <perl>join '.', ($r->param("ispmanVhostName"), $r->param("ispmanDomain"))</perl>
+cn: <perl>"$vhost.".$r->param("ispmanDomain").($port?":$port":"")</perl>
+uid: <perl>"$vhost.".$r->param("ispmanDomain").($port?":$port":"")</perl>
 uidNumber: <perl>$ispman->getUid()</perl>
 gidNumber: <perl>$r->param("domain_info")->{'gidNumber'}</perl>
 ispmanDomain: <perl>$r->param("ispmanDomain")</perl>
-uid: <perl>join '.' , ($r->param("ispmanVhostName"), $r->param("ispmanDomain"))</perl>
 homeDirectory: <perl>$r->param("homeDirectory") ||
 		(join "/",($r->param("domain_info")->{'homeDirectory'},
 			   "vhosts", $r->param("ispmanVhostName")))</perl>

Index: vhosts.conf.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/vhosts.conf.template,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- vhosts.conf.template	27 Jun 2004 10:25:46 -0000	1.17
+++ vhosts.conf.template	9 Jul 2004 22:19:14 -0000	1.18
@@ -1,4 +1,4 @@
-<VirtualHost <perl>$ispmanVhostIpAddress</perl>>
+<VirtualHost <perl>$ispmanVhostIpAddress</perl><perl>$port?":$port":""</perl>>
 	ServerName      <perl>$servername</perl>
 	<perl>if ($ispmanVhostServerAlias){
 			if (ref $ispmanVhostServerAlias eq "ARRAY"){



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com