From 2543cfcbcce14d157658aa23dc89eaf1b28061a2 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Thu, 7 Mar 2013 14:35:30 +0100
Subject: [PATCH] correct vhost template

---
 hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm      | 12 ++++++------
 hsarback/src/de/hsadmin/mods/pac/Pac.java            |  3 +++
 .../src/de/hsadmin/mods/pac/PacProcessorFactory.java |  3 +--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm
index 04aed0c..6474617 100644
--- a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm
@@ -51,9 +51,9 @@
 
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/    
-    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?\$ [novary]
-    RewriteCond /home/doms/${dom.name}/subs/\$\{tolower:%1\} -d
-    RewriteRule ^(.*) /home/doms/${dom.name}/subs/\$\{tolower:%1\}\$1 [last]     
+    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary]
+    RewriteCond /home/doms/${dom.name}/subs/${tolower:%1} -d
+    RewriteRule ^(.*) /home/doms/${dom.name}/subs/${tolower:%1}$1 [last]     
     
 #if( !${htdocsfallback} )
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
@@ -126,14 +126,14 @@
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/    
     RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?\$ [novary]
-    RewriteCond /home/doms/${dom.name}/subs-ssl/\$\{tolower:%1\} -d
-    RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/\$\{tolower:%1\}\$1 [last]    
+    RewriteCond /home/doms/${dom.name}/subs-ssl/${tolower:%1} -d
+    RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/${tolower:%1}$1 [last]    
     
 #if( !${htdocsfallback} )
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
 	RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
     RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:443)?\$ [novary]
-    RewriteCond /home/doms/${dom.name}/subs-ssl/\$\{tolower:%1\} !-d
+    RewriteCond /home/doms/${dom.name}/subs-ssl/${tolower:%1} !-d
     RewriteRule ^(.*) - [redirect=404,last]
 #end
 
diff --git a/hsarback/src/de/hsadmin/mods/pac/Pac.java b/hsarback/src/de/hsadmin/mods/pac/Pac.java
index b1e53be..15ae41e 100644
--- a/hsarback/src/de/hsadmin/mods/pac/Pac.java
+++ b/hsarback/src/de/hsadmin/mods/pac/Pac.java
@@ -211,6 +211,9 @@ public class Pac extends AbstractEntity implements Serializable {
 	}
 
 	public INetAddress getOldINetAddr() {
+		if (oldINetAddr == null) {
+			return getCurINetAddr();
+		}
 		return oldINetAddr;
 	}
 
diff --git a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
index c3158de..59d1654 100644
--- a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
@@ -27,7 +27,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
 		Hive hive = pac.getHive();
 		UnixUser unixUser = getPacAdminUser(pac);
 		String password = PasswordTool.generatePassword();
-		Processor processor = new CompoundProcessor(
+		return new CompoundProcessor(
 				createAddUserProc(pacName, unixUser, password), 
 				createSetQuotaProc(pac),
 				createEtcHostsProc(hive), 
@@ -39,7 +39,6 @@ public class PacProcessorFactory implements EntityProcessorFactory {
 				createIfUp(pacName),
 				createHttpdVirtualProc(hive),
 				createAccountingRulesProc());
-		return processor;
 	}
 
 	private Processor createAccountingRulesProc() {