Ignore more settings
This commit is contained in:
parent
1a0cdbe2ed
commit
2f541d797e
@ -41,7 +41,16 @@ EXCLUDES = set((
|
|||||||
'_new_volume',
|
'_new_volume',
|
||||||
'_send_digest_now',
|
'_send_digest_now',
|
||||||
'umbrella_list',
|
'umbrella_list',
|
||||||
'umbrella_member_suffix'
|
'umbrella_member_suffix',
|
||||||
|
'send_reminders',
|
||||||
|
'admin_member_chunksize',
|
||||||
|
'host_name',
|
||||||
|
'new_member_options',
|
||||||
|
'include_sender_header',
|
||||||
|
'drop_cc',
|
||||||
|
'available_languages',
|
||||||
|
'encode_ascii_prefixes',
|
||||||
|
'regular_exclude_lists'
|
||||||
))
|
))
|
||||||
|
|
||||||
|
|
||||||
@ -150,11 +159,12 @@ if __name__ == "__main__":
|
|||||||
globalconfig['dmarc_mitigate_action'] = dmarc_action_mapping(
|
globalconfig['dmarc_mitigate_action'] = dmarc_action_mapping(
|
||||||
globalconfig.get('from_is_list', 0)).name
|
globalconfig.get('from_is_list', 0)).name
|
||||||
globalconfig['dmarc_mitigate_unconditionally'] = True
|
globalconfig['dmarc_mitigate_unconditionally'] = True
|
||||||
del globalconfig['from_is_list']
|
|
||||||
else:
|
else:
|
||||||
globalconfig['dmarc_mitigate_action'] = dmarc_action_mapping(
|
globalconfig['dmarc_mitigate_action'] = dmarc_action_mapping(
|
||||||
globalconfig.get('dmarc_moderation_action', 0)).name
|
globalconfig.get('dmarc_moderation_action', 0)).name
|
||||||
globalconfig['dmarc_mitigate_unconditionally'] = False
|
globalconfig['dmarc_mitigate_unconditionally'] = False
|
||||||
|
if 'from_is_list' in globalconfig.keys():
|
||||||
|
del globalconfig['from_is_list']
|
||||||
# Handle the archiving policy. In MM2.1 there were two boolean options
|
# Handle the archiving policy. In MM2.1 there were two boolean options
|
||||||
# but only three of the four possible states were valid. Now there's just
|
# but only three of the four possible states were valid. Now there's just
|
||||||
# an enum.
|
# an enum.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user