From e6e3dc4fa6a4de2a8fc699b9c1196b59bef817a2 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Thu, 27 Oct 2022 10:02:50 -0400 Subject: [PATCH] Use nsd-control with reconfig and reload if they succeed and only fall back to restarting nsd if they fail --- management/dns_update.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/management/dns_update.py b/management/dns_update.py index 27b9a380..2bfc104f 100755 --- a/management/dns_update.py +++ b/management/dns_update.py @@ -98,6 +98,15 @@ def do_dns_update(env, force=False): # Tell nsd to reload changed zone files. if len(updated_domains) > 0: + # 'reconfig' is needed if there are added or removed zones, but + # it may not reload existing zones, so we call 'reload' too. If + # nsd isn't running, nsd-control fails, so in that case revert + # to restarting nsd to make sure it is running. Restarting nsd + # should also refresh everything. + try: + shell('check_call', ["/usr/sbin/nsd-control", "reconfig"]) + shell('check_call', ["/usr/sbin/nsd-control", "reload"]) + except: shell('check_call', ["/usr/sbin/service", "nsd", "restart"]) # Write the OpenDKIM configuration tables for all of the mail domains.