external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-25 19:17:22 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into dnstimeouthandling

Browse Source
This commit is contained in:
KiekerJan
2022-11-03 08:37:33 +01:00
parent c983037ff0 3314c4f7de
commit 6642f3f95a
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
management/dns_update.py
View File

@@ -98,7 +98,16 @@ def do_dns_update(env, force=False):
# Tell nsd to reload changed zone files.
if len(updated_domains) > 0:
shell('check_call', ["/usr/sbin/nsd-control", "reload"])
# '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.
from mailconfig import get_mail_domains