move content of old pacdomain

This commit is contained in:
Peter Hormanns 2011-12-16 15:09:23 +00:00
parent 2823a8d9b9
commit 2788820e7e

View File

@ -275,13 +275,13 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
String[] sourceDirs = new String[] { "web", "web-ssl", "cgi", "cgi-ssl", "fastcgi", "fastcgi-ssl" } ; 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" } ; String[] targetDirs = new String[] { "htdocs", "htdocs-ssl", "cgi", "cgi-ssl", "fastcgi", "fastcgi-ssl" } ;
CompoundProcessor processor = new CompoundProcessor( CompoundProcessor processor = new CompoundProcessor(
new ShellProcessor("rm -rf " + pacDir + "/subs " + pacDir + "/htdocs/.htaccess " new ShellProcessor("rm -rf " + domDir + "/subs " + domDir + "/htdocs/.htaccess "
+ pacDir + "/subs-ssl " + pacDir + "/htdocs-ssl/.htaccess ")); + domDir + "/subs-ssl " + domDir + "/htdocs-ssl/.htaccess "));
for (int idx = 0; idx < sourceDirs.length; idx++) { for (int idx = 0; idx < sourceDirs.length; idx++) {
processor.appendProcessor( processor.appendProcessor(
new ShellProcessor("shopt dotglob && ls " + pacDir + "/" + sourceDirs[idx] + " >/dev/null 2>&1" + new ShellProcessor("shopt dotglob && ls " + pacDir + "/" + sourceDirs[idx] + " >/dev/null 2>&1" +
" && mv " + domDir + "/" + sourceDirs[idx] + "/*" + targetDirs[idx] + "/ " + " && mv " + pacDir + "/" + sourceDirs[idx] + "/* " + domDir + "/" + targetDirs[idx] + "/ " +
" && rmdir " + domDir + "/" + sourceDirs[idx])); " && rmdir " + pacDir + "/" + sourceDirs[idx]));
} }
return processor; return processor;
} }