Ruakij/dnscontrol-sync
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Added conditional deletion of dumped file after we are done

Browse Source
This commit is contained in:
Ruakij 2021-08-02 14:25:26 +02:00
parent 002e2e4613
commit 43ed39f5d4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon.py
View File

@ -121,6 +121,7 @@ def readYamlFile(file: str):
return yaml.load(f, Loader=yaml.FullLoader) return yaml.load(f, Loader=yaml.FullLoader)
def updateNsData(zone): def updateNsData(zone):
hasToDelete = False
try: try:
zone = str(zone)[:-1] zone = str(zone)[:-1]
adaptedZone = adaptZoneName(zone) adaptedZone = adaptZoneName(zone)
@ -132,6 +133,8 @@ def updateNsData(zone):
raise Exception("Dumping data failed!") raise Exception("Dumping data failed!")
zone = adaptedZone zone = adaptedZone
hasToDelete = True
adaptFileForRequire(zone, dumpFile) adaptFileForRequire(zone, dumpFile)
if dnscontrolPush(zone) != 0: if dnscontrolPush(zone) != 0:
raise Exception("Pushing data failed!") raise Exception("Pushing data failed!")
@ -141,8 +144,9 @@ def updateNsData(zone):
log.error(f'{adaptedZone} |\t{sys.exc_info()}') log.error(f'{adaptedZone} |\t{sys.exc_info()}')
log.error(f'{adaptedZone} |\tUpdating NS-Data failed!') log.error(f'{adaptedZone} |\tUpdating NS-Data failed!')
if(hasToDelete):
deleteFile(dumpFile)
def adaptZoneName(zone): def adaptZoneName(zone):
if config['zone']['public-suffix'] != "" and zone.endswith(config['zone']['public-suffix']): if config['zone']['public-suffix'] != "" and zone.endswith(config['zone']['public-suffix']):
adaptedZone = zone[:-len(config['zone']['public-suffix'])] adaptedZone = zone[:-len(config['zone']['public-suffix'])]
@ -153,6 +157,10 @@ def dumpZoneData(zone, dumpFile):
log.debug(f"{zone} |\tDumping to '{dumpFile}'..") log.debug(f"{zone} |\tDumping to '{dumpFile}'..")
return os.system(f"dnscontrol get-zones --format=js --out={dumpFile} powerdns POWERDNS {zone}") return os.system(f"dnscontrol get-zones --format=js --out={dumpFile} powerdns POWERDNS {zone}")
def deleteFile(file):
log.debug(f"Deleting file '{file}'")
os.remove(file)
ignoreLinesRexp = r"^\s*(var|D\(|DnsProvider\(|DefaultTTL\()" ignoreLinesRexp = r"^\s*(var|D\(|DnsProvider\(|DefaultTTL\()"
def adaptFileForRequire(zone, dumpFile): def adaptFileForRequire(zone, dumpFile):
log.debug(f"{zone} |\tRewriting file '{dumpFile}'..") log.debug(f"{zone} |\tRewriting file '{dumpFile}'..")