From 43cee5e34d2531f9734b568fdf9bfcb0124488cd Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Tue, 30 Oct 2012 13:51:39 +0100 Subject: [PATCH 1/3] ignore build-directory --- hsarweb/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 hsarweb/.gitignore diff --git a/hsarweb/.gitignore b/hsarweb/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/hsarweb/.gitignore @@ -0,0 +1 @@ +/build From abd74a422fb5e42032139fb71698eaba1dcf7701 Mon Sep 17 00:00:00 2001 From: Michael Hierweck Date: Tue, 30 Oct 2012 13:56:40 +0100 Subject: [PATCH 2/3] Removed: Content migration (packet subdomain) --- .../mods/dom/DomainProcessorFactory.java | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java index 2cb54a1..fab7eac 100644 --- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java @@ -72,9 +72,6 @@ public class DomainProcessorFactory implements EntityProcessorFactory { templateVars.put("DOMAIN", domName); templateVars.put("USER_NAME", domUser.getComment()); mainProcessor.appendProcessor(hiveName, createApacheVHostSetupProcessor(em, dom, templateVars), "Setup Apache VHost"); - if (dom.isPacDomain()) { - mainProcessor.appendProcessor(hiveName, createMovePacDomainContent(em, dom), "Move pac domain content"); - } return mainProcessor; } @@ -372,43 +369,6 @@ public class DomainProcessorFactory implements EntityProcessorFactory { return vhostDelProcessor; } - private Processor createMovePacDomainContent(EntityManager em, Domain dom) { - Pac pac = dom.getUser().getPac(); - String pacName = pac.getName(); - String pacDir = "/home/pacs/" + pacName; - String domDir = pacDir + "/doms/" + pacName + ".hostsharing.net"; - 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(); - for (int idx = 0; idx < targetDirs.length; idx++) { - processor.appendProcessor( - new ShellProcessor("rm -rf " + domDir + "/" + targetDirs[idx])); - } - for (int idx = 0; idx < sourceDirs.length; idx++) { - processor.appendProcessor( - new ShellProcessor("shopt -s dotglob && ls " + pacDir + "/" + sourceDirs[idx] + " >/dev/null 2>&1" + - " && mv " + pacDir + "/" + sourceDirs[idx] + " " + domDir + "/" + targetDirs[idx] + - " || echo 'directory " + pacDir + "/" + sourceDirs[idx] + " not found'")); - } - processor.appendProcessor( - new ShellProcessor("test -L " + domDir + "/htdocs" + - " && test $( stat -c '%N' " + domDir + "/htdocs |sed -e\"s/[\\`']//g\" |cut -d ' ' -f 3 ) = web-ssl " + - " && cd " + domDir + - " && rm " + domDir + "/htdocs" + - " && ln -sf htdocs-ssl htdocs" + - " && chown -h " + pacName + ":" + pacName + " " + domDir + "/htdocs" + - " || echo 'link htdocs not found'")); - processor.appendProcessor( - new ShellProcessor("test -L " + domDir + "/htdocs-ssl" + - " && test $( stat -c '%N' " + domDir + "/htdocs-ssl |sed -e\"s/[\\`']//g\" |cut -d ' ' -f 3 ) = web " + - " && cd " + domDir + - " && rm " + domDir + "/htdocs-ssl" + - " && ln -sf htdocs htdocs-ssl" + - " && chown -h " + pacName + ":" + pacName + " " + domDir + "/htdocs-ssl" + - " || echo 'link htdocs-ssl not found'")); - return processor; - } - private String selectVHostTemplate(Domain dom) { String domName = dom.getName(); UnixUser user = dom.getUser(); From d0194f9967b875032e005deaffb415fdcde6fbf2 Mon Sep 17 00:00:00 2001 From: Michael Hierweck Date: Tue, 30 Oct 2012 14:09:44 +0100 Subject: [PATCH 3/3] Don't create/overwrite files in domain directory hierarchy on update. --- hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java index fab7eac..5712f0e 100644 --- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java @@ -71,6 +71,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory { templateVars.put("DOM_IPNUMBEREX", getOldIPAddress(pac)); templateVars.put("DOMAIN", domName); templateVars.put("USER_NAME", domUser.getComment()); + mainProcessor.appendProcessor(hiveName, createDomainDirectoriesProcessor(dom, templateVars), "Setup Domain Directories"); mainProcessor.appendProcessor(hiveName, createApacheVHostSetupProcessor(em, dom, templateVars), "Setup Apache VHost"); return mainProcessor; } @@ -340,7 +341,6 @@ public class DomainProcessorFactory implements EntityProcessorFactory { } Processor domSetupProcessor = new CompoundProcessor( - createDomainDirectoriesProcessor(dom, templateVars), new CreateFileProcessor(selectVHostTemplate(dom), templateVars, "/etc/apache2/sites-available/" + domName + ".tmp", "root", "root", "644", true), new ShellProcessor("ls /etc/apache2/pems/" + pac + ".pem >/dev/null 2>&1" + " && sed -i '/SSLCertificate.*default/d' " + "/etc/apache2/sites-available/" + domName + ".tmp" +