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

Sort the Custom DNS by zone and qname, and add an option to go back to the old sort order (creation order)

Browse Source 
Update the zone grouping style on the users and aliases page to match.

Fixes #1927
This commit is contained in:
Joshua Tauberer
2021-02-28 09:35:40 -05:00
parent 5fc1162355
commit 6653dbb2e2
6 changed files with 80 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
management/dns_update.py
View File

@@ -753,7 +753,7 @@ def write_opendkim_tables(domains, env):
########################################################################
def get_custom_dns_config(env):
def get_custom_dns_config(env, only_real_records=False):
try:
custom_dns = rtyaml.load(open(os.path.join(env['STORAGE_ROOT'], 'dns/custom.yaml')))
if not isinstance(custom_dns, dict): raise ValueError() # caught below
@@ -761,6 +761,8 @@ def get_custom_dns_config(env):
return [ ]
for qname, value in custom_dns.items():
if qname == "_secondary_nameserver" and only_real_records: continue # skip fake record
# Short form. Mapping a domain name to a string is short-hand
# for creating A records.
if isinstance(value, str):