From 74cceb35642e34e0182a16d8ed0f665ac42b4cc5 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Wed, 6 May 2020 14:47:38 +0200 Subject: [PATCH] update initial zonefile for autoconfig --- .../de/hsadmin/mods/dom/DomainProcessorFactory.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java index 2cb9038..023e9bf 100644 --- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java @@ -119,10 +119,14 @@ public class DomainProcessorFactory implements EntityProcessorFactory { zonefileTemplateVars.put("sio", Long.toString(System.currentTimeMillis()/1000L)); final String domName = dom.getName(); final String zonefileTargetPath = "/etc/bind/pri." + domName; - final Processor zonefileTemplateProcessor = - new VelocityProcessor("/de/hsadmin/mods/dom/zonefile.vm", zonefileTemplateVars, dom, zonefileTargetPath, false); +// final Processor zonefileTemplateProcessor = +// new VelocityProcessor("/de/hsadmin/mods/dom/zonefile.vm", zonefileTemplateVars, dom, zonefileTargetPath, false); + + final Processor getZonefileProcessor = new ShellProcessor("echo \"{DEFAULT_ZONEFILE}\" | /usr/local/sbin/gen-zonefile > " + zonefileTargetPath); + final Processor zonefileACLProcessor = - new ShellProcessor("chown root:bind " + zonefileTargetPath + " && chmod 644 " + zonefileTargetPath); + new ShellProcessor("chown root:bind " + zonefileTargetPath + " && chmod 644 " + zonefileTargetPath); + final String hiveName = dom.getUser().getHiveName(); final Query domsQuery = em.createQuery("SELECT d FROM Domains d WHERE d.user.pac.hive.name = :hivename"); domsQuery.setParameter("hivename", hiveName); @@ -153,7 +157,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory { "|| ( mv /etc/bind/named.pri-zones.tmp /etc/bind/named.pri-zones && invoke-rc.d bind9 reload )") ); final Processor dnsSetupProcessor = - new CompoundProcessor(zonefileTemplateProcessor, zonefileACLProcessor, prizonesFileProcessor); + new CompoundProcessor(getZonefileProcessor, zonefileACLProcessor, prizonesFileProcessor); return dnsSetupProcessor; }