Commit 4ed37a67 authored by Valentin Samir's avatar Valentin Samir
Browse files

Make settime quiet, use inactive variable when setting inactive and delete on KSK

It is more readable
parent 08775fb1
...@@ -45,12 +45,12 @@ def get_zones(zone_names=None): ...@@ -45,12 +45,12 @@ def get_zones(zone_names=None):
def settime(path, flag, date): def settime(path, flag, date):
cmd = ["/usr/sbin/dnssec-settime", "-i", str(int(INTERVAL.total_seconds())), "-%s" % flag, date, path] cmd = ["/usr/sbin/dnssec-settime", "-i", str(int(INTERVAL.total_seconds())), "-%s" % flag, date, path]
p = subprocess.Popen(cmd, stderr=subprocess.PIPE) p = subprocess.Popen(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
err = p.communicate()[1] err = p.communicate()[1]
if p.returncode != 0: if p.returncode != 0:
raise ValueError("err %s: %s" % (p.returncode, err)) raise ValueError("err %s: %s" % (p.returncode, err))
if err: if err:
print err sys.stderr.write("%s\n" % err)
def bind_chown(path): def bind_chown(path):
os.chown(path, 104, -1) os.chown(path, 104, -1)
...@@ -125,10 +125,11 @@ class Zone(object): ...@@ -125,10 +125,11 @@ class Zone(object):
now = datetime.datetime.utcnow() now = datetime.datetime.utcnow()
for ksk in old_ksks: for ksk in old_ksks:
print " * program key %s removal" % ksk.keyid print " * program key %s removal" % ksk.keyid
inactive = max(seen_ksk.activate, now + INTERVAL)
# delete INTERVAL after being inactive # delete INTERVAL after being inactive
ksk.delete = max(seen_ksk.activate, now + INTERVAL) + INTERVAL ksk.delete = inactive + INTERVAL
# set inactive in at least INTERVAL # set inactive in at least INTERVAL
ksk.inactive = max(seen_ksk.activate, now + INTERVAL) ksk.inactive = inactive
bind_reload() bind_reload()
def remove_deleted(self): def remove_deleted(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment