external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-25 02:47:04 +00:00
Code Issues Releases Wiki Activity

nsd.conf wasn't properly using the signed zone files

Browse Source
This commit is contained in:
Joshua Tauberer 2014-06-18 23:30:35 +00:00
parent dd15bf4384
commit 761fac729b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
management/dns_update.py
View File

@ -72,9 +72,13 @@ def do_dns_update(env):
# write_nsd_zone is smart enough to check if a zone's signature # write_nsd_zone is smart enough to check if a zone's signature
# is nearing experiation and if so it'll bump the serial number # is nearing experiation and if so it'll bump the serial number
# and return True so we get a chance to re-sign it. # and return True so we get a chance to re-sign it.
# sign_zone(domain, zonefile, env)
# Also update the zone's filename so nsd.conf uses the signed file.
zonefiles[i][1] = sign_zone(domain, zonefile, env) # Now that all zones are signed (some might not have changed and so didn't
# just get signed now, but were before) update the zone filename so nsd.conf
# uses the signed file.
for i in range(len(zonefiles)):
zonefiles[i][1] += ".signed"
# Write the main nsd.conf file. # Write the main nsd.conf file.
if write_nsd_conf(zonefiles): if write_nsd_conf(zonefiles):
@ -365,9 +369,6 @@ def sign_zone(domain, zonefile, env):
for fn in files_to_kill: for fn in files_to_kill:
os.unlink(fn) os.unlink(fn)
# Update the zone's filename so nsd.conf uses the signed file.
return zonefile + ".signed"
######################################################################## ########################################################################
def get_ds_records(env): def get_ds_records(env):