From b2b192833ce58101b91910798d206b01216d39fc Mon Sep 17 00:00:00 2001
From: Purodha <bli00@hostsharing.net>
Date: Thu, 07 Mar 2013 18:17:19 +0100
Subject: [PATCH] Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git

---
 hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm           |   18 +++++++++---------
 hsarback/src/de/hsadmin/mods/pac/Pac.java                 |    3 +++
 hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java |    3 +--
 hsarback/src/de/hsadmin/mods/dom/htaccess.vm              |    2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/htaccess.vm b/hsarback/src/de/hsadmin/mods/dom/htaccess.vm
index c0c8540..dd5e6d3 100644
--- a/hsarback/src/de/hsadmin/mods/dom/htaccess.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/htaccess.vm
@@ -1 +1 @@
-Redirect permanent / ${protocol}://www.{domain.name}/
+Redirect permanent / ${protocol}://www.${domain.name}/
diff --git a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm
index 04aed0c..709794b 100644
--- a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm
@@ -52,14 +52,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/\$\{tolower:%1\} -d
-    RewriteRule ^(.*) /home/doms/${dom.name}/subs/\$\{tolower:%1\}\$1 [last]     
+    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/
 	RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
-    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?\$ [novary]
-    RewriteCond /home/doms/${dom.name}/subs/\$\{tolower:%1\} !-d
+    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?$ [novary]
+    RewriteCond /home/doms/${dom.name}/subs/#[[${tolower:%1} ]]# !-d
     RewriteRule ^(.*) - [redirect=404,last]
 #end
 
@@ -125,15 +125,15 @@
     
     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 %{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]    
     
 #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 %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:443)?$ [novary]
+    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 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 @@
 		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 @@
 				createIfUp(pacName),
 				createHttpdVirtualProc(hive),
 				createAccountingRulesProc());
-		return processor;
 	}
 
 	private Processor createAccountingRulesProc() {

--
Gitblit v1.9.1