hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

Don't create/overwrite files in domain directory hierarchy on update.

Browse Source
This commit is contained in:
Michael Hierweck 2012-10-30 14:09:44 +01:00
parent abd74a422f
commit d0194f9967
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
View File

@ -71,6 +71,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
templateVars.put("DOM_IPNUMBEREX", getOldIPAddress(pac)); templateVars.put("DOM_IPNUMBEREX", getOldIPAddress(pac));
templateVars.put("DOMAIN", domName); templateVars.put("DOMAIN", domName);
templateVars.put("USER_NAME", domUser.getComment()); 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"); mainProcessor.appendProcessor(hiveName, createApacheVHostSetupProcessor(em, dom, templateVars), "Setup Apache VHost");
return mainProcessor; return mainProcessor;
} }
@ -340,7 +341,6 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
} }
Processor domSetupProcessor = new CompoundProcessor( Processor domSetupProcessor = new CompoundProcessor(
createDomainDirectoriesProcessor(dom, templateVars),
new CreateFileProcessor(selectVHostTemplate(dom), templateVars, "/etc/apache2/sites-available/" + domName + ".tmp", "root", "root", "644", true), 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" + new ShellProcessor("ls /etc/apache2/pems/" + pac + ".pem >/dev/null 2>&1" +
" && sed -i '/SSLCertificate.*default/d' " + "/etc/apache2/sites-available/" + domName + ".tmp" + " && sed -i '/SSLCertificate.*default/d' " + "/etc/apache2/sites-available/" + domName + ".tmp" +