From 2788820e7ee44c70316ea04b9e081d5871a9c02b Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@hostsharing.net>
Date: Fri, 16 Dec 2011 16:09:23 +0100
Subject: [PATCH] move content of old pacdomain

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

diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
index 7adeaa8..5416d11 100644
--- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
@@ -275,13 +275,13 @@
 		String[] sourceDirs = new String[] { "web", "web-ssl", "cgi", "cgi-ssl", "fastcgi", "fastcgi-ssl" } ;
 		String[] targetDirs = new String[] { "htdocs", "htdocs-ssl", "cgi", "cgi-ssl", "fastcgi", "fastcgi-ssl" } ;
 		CompoundProcessor processor = new CompoundProcessor(
-			new ShellProcessor("rm -rf " + pacDir + "/subs " + pacDir + "/htdocs/.htaccess " 
-										 + pacDir + "/subs-ssl " + pacDir + "/htdocs-ssl/.htaccess "));
+			new ShellProcessor("rm -rf " + domDir + "/subs " + domDir + "/htdocs/.htaccess " 
+										 + domDir + "/subs-ssl " + domDir + "/htdocs-ssl/.htaccess "));
 		for (int idx = 0; idx < sourceDirs.length; idx++) {
 			processor.appendProcessor(
 				new ShellProcessor("shopt dotglob && ls " + pacDir + "/" + sourceDirs[idx] + " >/dev/null 2>&1" +
-						" && mv " + domDir + "/" + sourceDirs[idx] + "/*" + targetDirs[idx] + "/ " +
-						" && rmdir " + domDir + "/" + sourceDirs[idx]));
+						" && mv " + pacDir + "/" + sourceDirs[idx] + "/* " + domDir + "/" + targetDirs[idx] + "/ " +
+						" && rmdir " + pacDir + "/" + sourceDirs[idx]));
 		}
 		return processor;
 	}

--
Gitblit v1.9.3