ispman/install-data/templates vhosts.conf.template, 1.19, 1.20
Joerg Delker <[email protected]>
| Newsgroups | gmane.comp.isp.ispman.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ispman/ispman/install-data/templates
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10552/install-data/templates
Modified Files:
vhosts.conf.template
Log Message:
moving $ispmanVhostExtraConf to end (allows option override)
Index: vhosts.conf.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/vhosts.conf.template,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- vhosts.conf.template 29 Sep 2004 20:46:12 -0000 1.19
+++ vhosts.conf.template 15 Jun 2006 15:49:49 -0000 1.20
@@ -14,12 +14,12 @@
DocumentRoot <perl>$documentroot</perl>
CustomLog <perl>"$logdir/$servername.access"</perl> combined
ErrorLog <perl>"$logdir/$servername.errors"</perl>
- <perl>$statalias</perl>
- <perl>$ispmanVhostExtraConf</perl>
<Directory <perl>$documentroot</perl>>
<perl>$ispmanVhostDocumentRootOption</perl>
AllowOverride FileInfo AuthConfig Limit Indexes
</Directory>
+ <perl>$statalias</perl>
+
<perl>
if($ispmanVhostScriptDirOption =~ /ExecCGI/) {
$OUT .= " ScriptAlias /cgi-bin/ $scriptdir/\n";
@@ -29,13 +29,11 @@
$OUT .= " </Directory>\n";
}
</perl>
-
<Directory <perl>$scriptdir</perl>>
<perl>$ispmanVhostScriptDirOption</perl>
</Directory>
-
<perl>
$_stasText='';
@@ -80,7 +78,7 @@
</IfModule>
</IfModule>
-
+ <perl>$ispmanVhostExtraConf</perl>
</VirtualHost>