fix dns changed on domain delete

This commit is contained in:
Peter Hormanns 2020-05-27 13:03:21 +02:00
parent 67a3a59800
commit cdc84a53e1

View File

@ -113,10 +113,8 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
} }
private ShellProcessor createHiveDNSRemoveProcessor(String domName) { private ShellProcessor createHiveDNSRemoveProcessor(String domName) {
return new ShellProcessor("grep -v '\"pri." + domName + "\"' /etc/bind/named.pri-zones > /etc/bind/named.pri-zones.tmp" + return new ShellProcessor("rm -f /etc/bind/pri." + domName +
" && mv /etc/bind/named.pri-zones.tmp /etc/bind/named.pri-zones" + " && salt-call state.sls pacs");
" && rm -f /etc/bind/pri." + domName +
" && invoke-rc.d bind9 reload");
} }
private Processor createMailinSetupProcessor(EntityManager em, Domain dom, Pac pac) throws ProcessorException { private Processor createMailinSetupProcessor(EntityManager em, Domain dom, Pac pac) throws ProcessorException {
@ -323,7 +321,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
" && mkdir " + homedir + "/doms.bak" + " && mkdir " + homedir + "/doms.bak" +
" && mv " + homedir + "/doms/" + domname + " " + homedir + "/doms.bak/" + " && mv " + homedir + "/doms/" + domname + " " + homedir + "/doms.bak/" +
" && chown -R " + username + ":" + username + " " + 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"); " && invoke-rc.d apache2 reload >/dev/null 2>&1");
} }
return return