From b92369eea81b24af215ed8447414be47324da356 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Tue, 30 Oct 2012 10:46:25 +0100
Subject: [PATCH] vhost templates from michael

---
 hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
index 3a320a3..2cb54a1 100644
--- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
@@ -325,21 +325,21 @@
 		// TODO: This code should be cleaned up after switching to the velocity template engine.
 		query.setParameter("option", "htdocsfallback");		
 		if (query.getResultList().isEmpty()) {
-			templateVars.put("HTDOCSFALLBACKHTTP",
+			templateVars.put("NOHTDOCSFALLBACKHTTP",
 		    "    RewriteCond %{REQUEST_URI} !^/cgi-bin/\n" +
 		    "    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/\n" +
 		    "    RewriteCond %{HTTP_HOST} ^(.+)\\.{DOM_HOSTNAME}\\.?(:80)?$ [novary]\n" +
 		    "    RewriteCond /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1} !-d\n" +
-		    "    RewriteRule ^(.*) - [redirect=404,last]");
-			templateVars.put("HTDOCSFALLBACKHTTPS",
+		    "    RewriteRule ^(.*) - [redirect=404,last]\n");
+			templateVars.put("NOHTDOCSFALLBACKHTTPS",
 		    "    RewriteCond %{REQUEST_URI} !^/cgi-bin/\n" +
 		    "    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/\n" +
 		    "    RewriteCond %{HTTP_HOST} ^(.+)\\.{DOM_HOSTNAME}\\.?(:443)?$ [novary]\n" +
 		    "    RewriteCond /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1} !-d\n" +
-		    "    RewriteRule ^(.*) - [redirect=404,last]");						
+		    "    RewriteRule ^(.*) - [redirect=404,last]\n");						
 		} else {
-			templateVars.put("HTDOCSFALLBACKHTTP", "\n");
-			templateVars.put("HTDOCSFALLBACKHTTPS", "\n");
+			templateVars.put("NOHTDOCSFALLBACKHTTP", "\n");
+			templateVars.put("NOHTDOCSFALLBACKHTTPS", "\n");
 		}
 	    		
 		Processor domSetupProcessor = new CompoundProcessor(

--
Gitblit v1.9.0-SNAPSHOT