From 400c14a23e4e49f94de6f207d09d5c0633de6f76 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Thu, 20 Sep 2012 17:21:04 +0200
Subject: [PATCH] merged

---
 hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl
index 3598247..7ff5764 100644
--- a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl
+++ b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl
@@ -1,4 +1,9 @@
-<!-- BEGIN: main --><VirtualHost {DOM_IPNUMBER}:80 {DOM_IPNUMBEREX}:80>
+<!-- BEGIN: main --># 
+# This file is managed by HSAdmin.
+# Do not edit manually. Changes will be overwritten.
+#
+
+<VirtualHost {DOM_IPNUMBER}:80 {DOM_IPNUMBEREX}:80>
 
     ServerName {DOM_HOSTNAME}
     ServerAlias *.{DOM_HOSTNAME}
@@ -37,8 +42,8 @@
     RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?$ [novary]
     RewriteCond /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1} -d
     RewriteRule ^(.*) /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1}$1 [last]
-
-<!-- BEGIN: iterate -->    RewriteCond %{REQUEST_URI} !^/cgi-bin/
+<!-- BEGIN: iterate -->
+    RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
     RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?$ [novary]
     RewriteCond /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1} !-d
@@ -95,14 +100,14 @@
     RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:443)?$ [novary]
     RewriteCond /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1} -d
     RewriteRule ^(.*) /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1}$1 [last]
-    
-<!-- BEGIN: nosubdomainfallbackforhttps -->    RewriteCond %{REQUEST_URI} !^/cgi-bin/
+<!-- BEGIN: nosubdomainfallbackforhttps -->
+    RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
     RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:443)?$ [novary]
     RewriteCond /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1} !-d
     RewriteRule ^(.*) - [redirect=404,last]
-    
-<!-- END: nosubdomainfallbackforhttps -->    AddType application/x-httpd-php .php .php5 .php4 .php3
+<!-- END: nosubdomainfallbackforhttps -->
+    AddType application/x-httpd-php .php .php5 .php4 .php3
     Action application/x-httpd-php /fastcgi-bin/phpstub
 
 </VirtualHost>

--
Gitblit v1.9.0-SNAPSHOT