ispman/install-data/templates vhosts.conf.template, 1.24, 1.25

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

Modified Files:
	vhosts.conf.template 
Log Message:
utilizing now ispmanVhostFeature
some simplifying and cleanup

Index: vhosts.conf.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/vhosts.conf.template,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- vhosts.conf.template	7 Jun 2007 14:52:43 -0000	1.24
+++ vhosts.conf.template	11 Jun 2007 10:18:40 -0000	1.25
@@ -1,52 +1,32 @@
 <VirtualHost <perl>$ispmanVhostIpAddress</perl><perl>$port?":$port":""</perl>>
 	ServerName      <perl>$servername</perl>
-	<perl>if ($ispmanVhostServerAlias){
-			if (ref $ispmanVhostServerAlias eq "ARRAY"){
-				$ServerAliases=join " ", @$ispmanVhostServerAlias;
-			} else {
-				$ServerAliases=join " ", split(/\s\s*/, $ispmanVhostServerAlias);
-			}
-			
-			$ServerAliases="ServerAlias	$ServerAliases ";
-		}
-		$ServerAliases </perl>
+<perl>
+if ($ispmanVhostServerAlias){
+	"ServerAlias ".${join " ", @$ispmanVhostServerAlias}
+}	
+</perl>
 	<perl>$urlredirect</perl>
+	
+	## DocumentDir
 	DocumentRoot    <perl>$documentroot</perl>
 
 	<Directory <perl>$documentroot</perl>>
 		<perl>$ispmanVhostDocumentRootOption</perl>
 		AllowOverride FileInfo AuthConfig Limit Indexes
 	</Directory>
-	<perl>$statalias</perl>
-
-	## if you want individual vhost logging instead of using ispman.vlogger
-	## uncomment the following
-	## CustomLog       <perl>"$logdir/$servername.access"</perl> combined
-	ErrorLog        <perl>"$logdir/$servername.errors"</perl>
-
-	<IfModule mod_suexec.c>
-		SuexecUserGroup  "#<perl>$uidNumber</perl>" "#<perl>$gidNumber</perl>"
-	</IfModule>
 
-<perl>
-  if($ispmanVhostScriptDirOption =~ /ExecCGI/) {
-    $OUT .= "	ScriptAlias /cgi-bin/ $scriptdir/\n";
-    $OUT .= "	<Directory $scriptdir>\n";
-    $OUT .= "		$ispmanVhostScriptDirOption\n";
-    $OUT .= "		AllowOverride FileInfo AuthConfig Limit Indexes\n";
-    $OUT .= "	</Directory>\n";
-  }
-</perl>
+	## ScriptDir
+	ScriptAlias /cgi-bin/ $scriptdir/
 	
 	<Directory <perl>$scriptdir</perl>>
 		<perl>$ispmanVhostScriptDirOption</perl>
 	</Directory>
 
 <perl>
-$_statsText='';
-
-if ($statdir){
-$_statsText=qq|
+if ($statdir && $ispmanVhostFeature{'statdirs'}){
+qq|
+        ## Feature: statdirs
+	Alias /stats $statdir
 
 	<Directory $statdir>
 		$ispmanVhostDocumentRootOption
@@ -77,15 +57,27 @@
 	</Directory>
 |;
 }
-
-$_statsText;
-	
 </perl>
+	## Logging
+	## if you want individual vhost logging instead of using ispman.vlogger
+	## uncomment the following
+	## CustomLog       <perl>"$logdir/$servername.access"</perl> combined
+	ErrorLog        <perl>"$logdir/$servername.errors"</perl>
 
-	<perl>
-	$acltext;
-	</perl>
+<perl>
+if ($ispmanVhostFeature{suexec}) {
+qq|
+	## Feature: suexec
+	<IfModule mod_suexec.c>
+		SuexecUserGroup  "#$uidNumber" "#$gidNumber"
+	</IfModule>
+|;}
+</perl>
 
+<perl>
+if ($ispmanVhostFeature{userdirs}) {
+qq|
+        ## Feature: userdirs
 	<IfModule mod_rewrite.c>
 		#If we have mod_rewrite then we can map users via rewrite and save on LDAP lookups
 		RewriteEngine On
@@ -102,8 +94,20 @@
 			LDAPUserDirBaseDN ispmanDomain=<perl>$ispmanDomain</perl>,<perl>$ldapBaseDN</perl>
 		</IfModule>
 	</IfModule>
+|;}
+</perl>
 
-	<perl>$ispmanVhostExtraConf</perl>
+<perl>
+	$acltext;
+</perl>
+
+<perl>
+if ($ispmanVhostExtraConf) {
+qq|
+	## ExtraConf:
+	$ispmanVhostExtraConf
+|;}
+</perl>
 
 </VirtualHost>
 


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/