From aad18738f37bf2eb573b12f2a18a96c518c7c06e Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael.hierweck@hostsharing.net>
Date: Wed, 15 Aug 2012 10:54:47 +0000
Subject: [PATCH] =?UTF-8?q?Das=20Template=20unterst=C3=BCtzt=20die=20Deakt?=
 =?UTF-8?q?ivierung=20des=20Fallbacks=20auf=20htdocs(-ssl)=20nicht=20nicht?=
 =?UTF-8?q?=20als=20Verzeichnis=20angelegte=20Subdomains=20unter=20subs(-s?=
 =?UTF-8?q?sl).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/hsadmin/mods/dom/httpd-vhost-static.jtpl    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl
index d1e2a97..8db34fc 100644
--- a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl
+++ b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl
@@ -26,11 +26,16 @@
 
     RewriteEngine On
     RewriteOptions Inherit
+    
     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]
 
-</VirtualHost>
+<!-- BEGIN: nosubdomainfallbackforhttp -->    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?$ [novary]
+    RewriteCond /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1} !-d
+    RewriteRule ^(.*) - [redirect=404,last]
+
+<!-- END: nosubdomainfallbackforhttp --></VirtualHost>
 
 <VirtualHost {DOM_IPNUMBER}:443 {DOM_IPNUMBEREX}:443>
 
@@ -67,9 +72,14 @@
     
     RewriteEngine On
     RewriteOptions Inherit
+    
     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]
 
-</VirtualHost>
+<!-- BEGIN: nosubdomainfallbackforhttps -->    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:443)?$ [novary]
+    RewriteCond /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1} !-d
+    RewriteRule ^(.*) - [redirect=404,last]
+    
+<!-- END: nosubdomainfallbackforhttps --></VirtualHost>
 <!-- END: main -->
\ No newline at end of file