Merge ~hloeung/smtp-relay-charm:mx into smtp-relay-charm:master

[Haw Loeung]

Fixed reducing complexity

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Joel Sing (jsing)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision c31f3072268a089ce96fa61fd92e18e5c88f7004

diff --git a/reactive/smtp_relay.py b/reactive/smtp_relay.py
index 58ec8b3..cddb1f3 100644
--- a/reactive/smtp_relay.py
+++ b/reactive/smtp_relay.py
@@ -203,19 +203,19 @@ def configure_smtp_relay(postfix_conf_dir='/etc/postfix', tls_dh_params='/etc/ss
         'connection_limit': config['connection_limit'],
         'enable_rate_limits': config['enable_rate_limits'],
         'enable_reject_unknown_recipient_domain': config['enable_reject_unknown_recipient_domain'],
-        'enable_relay_access': True if config['relay_access_sources'] else False,
-        'enable_sender_login_map': True if config['sender_login_maps'] else False,
+        'enable_relay_access': bool(config['relay_access_sources']),
+        'enable_sender_login_map': bool(config['sender_login_maps']),
         'enable_smtp_auth': config['enable_smtp_auth'],
-        'enable_tls_policy_map': True if config['tls_policy_maps'] else False,
-        'header_checks': True if config['header_checks'] else False,
+        'enable_tls_policy_map': bool(config['tls_policy_maps']),
+        'header_checks': bool(config['header_checks']),
         'message_size_limit': config['message_size_limit'],
         'milter': _get_milters(),
         'myorigin': False,  # XXX: Configurable when given hostname override
         'mynetworks': config['allowed_relay_networks'],
         'relayhost': config['relay_host'],
-        'restrict_recipients': True if config['restrict_recipients'] else False,
-        'restrict_senders': True if config['restrict_senders'] else False,
-        'restrict_sender_access': True if config['restrict_sender_access'] else False,
+        'restrict_recipients': bool(config['restrict_recipients']),
+        'restrict_senders': bool(config['restrict_senders']),
+        'restrict_sender_access': bool(config['restrict_sender_access']),
         'tls_cert_key': tls_cert_key,
         'tls_cert': tls_cert,
         'tls_key': tls_key,
@@ -224,8 +224,8 @@ def configure_smtp_relay(postfix_conf_dir='/etc/postfix', tls_dh_params='/etc/ss
         'tls_exclude_ciphers': config['tls_exclude_ciphers'],
         'tls_protocols': config['tls_protocols'],
         'tls_security_level': config['tls_security_level'],
-        'transport_maps': True if config['transport_maps'] else False,
-        'virtual_alias_maps': True if config['virtual_alias_maps'] else False,
+        'transport_maps': bool(config['transport_maps']),
+        'virtual_alias_maps': bool(config['virtual_alias_maps']),
     }
     base = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
     env = jinja2.Environment(loader=jinja2.FileSystemLoader(base))