daemon.py

@@ -163,7 +163,7 @@ def updateNsData(zone):
         
         hasToDelete = True
 
-        adaptFileForRequire(zone, HOSTS_PATH, dumpFile)
+        adaptFileForRequire(zone, dumpFile)
         if dnscontrolPush(zone) != 0:
             raise Exception("Pushing data failed!")
 
@@ -173,7 +173,7 @@ def updateNsData(zone):
         log.warning(f'{adaptedZone} |\tUpdating NS-Data failed!')
 
     if(hasToDelete):
-        deleteFile(os.path.join(HOSTS_PATH, dumpFile))
+        deleteFile(dumpFile)
     
 def adaptZoneName(zone):
     if config['zone']['public-suffix'] != "" and zone.endswith(config['zone']['public-suffix']):
@@ -190,19 +190,17 @@ def deleteFile(file):
     os.remove(file)
 
 ignoreLinesRexp = r"^\s*(var|D\(|DnsProvider\(|DefaultTTL\()"
-def adaptFileForRequire(zone, path, dumpFile):
+def adaptFileForRequire(zone, dumpFile):
     log.debug(f"{zone} |\tRewriting file '{dumpFile}'..")
 
-    dumpFilePath = os.path.join(path, dumpFile)
-
-    with open(dumpFilePath, 'r') as fin:
-        with open(f"{dumpFilePath}.tmp", 'w+') as fout:
+    with open(dumpFile, 'r') as fin:
+        with open(f"{dumpFile}.tmp", 'w+') as fout:
             fout.write(f'D_EXTEND("{zone}",\n')
 
             for line in fin:
                 if not re.match(ignoreLinesRexp, line):
                     fout.write(line)
-    os.replace(f"{dumpFilePath}.tmp", dumpFilePath)
+    os.replace(f"{dumpFile}.tmp", dumpFile)
 
 def dnscontrolPush(zone):
     log.debug(f'{zone} |\tPushing..')