From cdc84a53e1c059e174cb0c5b63fad90745012e64 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Wed, 27 May 2020 13:03:21 +0200 Subject: [PATCH] fix dns changed on domain delete --- .../src/de/hsadmin/mods/dom/DomainProcessorFactory.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java index 4406462..84d3d79 100644 --- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java @@ -113,10 +113,8 @@ public class DomainProcessorFactory implements EntityProcessorFactory { } private ShellProcessor createHiveDNSRemoveProcessor(String domName) { - return new ShellProcessor("grep -v '\"pri." + domName + "\"' /etc/bind/named.pri-zones > /etc/bind/named.pri-zones.tmp" + - " && mv /etc/bind/named.pri-zones.tmp /etc/bind/named.pri-zones" + - " && rm -f /etc/bind/pri." + domName + - " && invoke-rc.d bind9 reload"); + return new ShellProcessor("rm -f /etc/bind/pri." + domName + + " && salt-call state.sls pacs"); } private Processor createMailinSetupProcessor(EntityManager em, Domain dom, Pac pac) throws ProcessorException { @@ -323,7 +321,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory { " && mkdir " + homedir + "/doms.bak" + " && mv " + homedir + "/doms/" + domname + " " + homedir + "/doms.bak/" + " && chown -R " + username + ":" + username + " " + homedir + "/doms.bak" + - " && salt-call state.sls pacs " + + // " && salt-call state.sls pacs " + " && invoke-rc.d apache2 reload >/dev/null 2>&1"); } return