Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Samir
bind-dnssec
Commits
d2b910e5
Commit
d2b910e5
authored
Jul 26, 2016
by
Valentin Samir
Browse files
Set inactive date before delete date
parent
d29d040f
Changes
1
Hide whitespace changes
Inline
Side-by-side
routine.py
View file @
d2b910e5
...
...
@@ -110,9 +110,8 @@ class Zone(object):
def
do_zsk
(
self
):
for
zsk
in
self
.
ZSK
:
if
zsk
.
is_activate
:
inactive
=
zsk
.
activate
+
ZSK_VALIDITY
zsk
.
delete
=
inactive
+
INTERVAL
zsk
.
inactive
=
inactive
zsk
.
inactive
=
zsk
.
activate
+
ZSK_VALIDITY
zsk
.
delete
=
zsk
.
inactive
+
INTERVAL
if
zsk
.
is_activate
:
zsk
.
gen_successor
()
bind_reload
()
...
...
@@ -151,11 +150,10 @@ class Zone(object):
seen_ksk
.
activate
=
(
now
+
INTERVAL
)
for
ksk
in
old_ksks
:
print
" * program key %s removal"
%
ksk
.
keyid
inactive
=
seen_ksk
.
activate
# delete INTERVAL after being inactive
ksk
.
delete
=
inactive
+
INTERVAL
# set inactive in at least INTERVAL
ksk
.
inactive
=
inactive
ksk
.
inactive
=
seen_ksk
.
activate
# delete INTERVAL after being inactive
ksk
.
delete
=
ksk
.
inactive
+
INTERVAL
bind_reload
()
def
remove_deleted
(
self
):
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment