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

[Haw Loeung]

Allow specifying virtual alias domains for running as MX

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

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

[Paul Collins (pjdc)]

review: Approve (lgtm)

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

Change successfully merged at revision ed9800757df5c1a5924f6b59c91c5f9d70a65852

diff --git a/config.yaml b/config.yaml
index b3d6470..6014e5c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -168,6 +168,14 @@ options:
       to indicate it is managed outside of juju configs).
 
       http://www.postfix.org/postconf.5.html#transport_maps
+  virtual_alias_domains:
+    type: string
+    default: ''
+    description: |
+      Optional list of domains for which all addresses are aliased to
+      addresses in other local or remote domains.
+
+      http://www.postfix.org/postconf.5.html#virtual_alias_domains
   virtual_alias_maps:
     type: string
     default: ''
diff --git a/reactive/smtp_relay.py b/reactive/smtp_relay.py
index cddb1f3..ed69309 100644
--- a/reactive/smtp_relay.py
+++ b/reactive/smtp_relay.py
@@ -123,6 +123,7 @@ def configure_smtp_auth(dovecot_config='/etc/dovecot/dovecot.conf', dovecot_user
     'config.changed.tls_protocols',
     'config.changed.tls_security_level',
     'config.changed.transport_maps',
+    'config.changed.virtual_alias_domains',
     'config.changed.virtual_alias_maps',
 )
 def config_changed():
@@ -225,6 +226,7 @@ def configure_smtp_relay(postfix_conf_dir='/etc/postfix', tls_dh_params='/etc/ss
         'tls_protocols': config['tls_protocols'],
         'tls_security_level': config['tls_security_level'],
         'transport_maps': bool(config['transport_maps']),
+        'virtual_alias_domains': config['virtual_alias_domains'],
         'virtual_alias_maps': bool(config['virtual_alias_maps']),
     }
     base = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
diff --git a/templates/postfix_main_cf.tmpl b/templates/postfix_main_cf.tmpl
index c92ee6f..c5ddfee 100644
--- a/templates/postfix_main_cf.tmpl
+++ b/templates/postfix_main_cf.tmpl
@@ -106,6 +106,9 @@ header_checks = regexp:/etc/postfix/header_checks
 {%- if transport_maps %}
 transport_maps = hash:/etc/postfix/transport
 {% endif %}
+{%- if virtual_alias_domains %}
+virtual_alias_domains = {{virtual_alias_domains}}
+{%- endif -%}
 {%- if virtual_alias_maps %}
 virtual_alias_maps = hash:/etc/postfix/virtual_alias
 {% endif %}
diff --git a/tests/unit/files/postfix_main_transport_maps_with_virtual_alias_maps.cf b/tests/unit/files/postfix_main_transport_maps_with_virtual_alias_maps.cf
index 6049e7c..3df14ec 100644
--- a/tests/unit/files/postfix_main_transport_maps_with_virtual_alias_maps.cf
+++ b/tests/unit/files/postfix_main_transport_maps_with_virtual_alias_maps.cf
@@ -58,4 +58,5 @@ smtpd_sender_restrictions = reject_unknown_sender_domain, check_sender_access ha
 
 transport_maps = hash:/etc/postfix/transport
 
+virtual_alias_domains = mydomain.local mydomain2.local
 virtual_alias_maps = hash:/etc/postfix/virtual_alias
diff --git a/tests/unit/test_smtp_relay.py b/tests/unit/test_smtp_relay.py
index f9cdd61..5177d44 100644
--- a/tests/unit/test_smtp_relay.py
+++ b/tests/unit/test_smtp_relay.py
@@ -78,6 +78,7 @@ class TestCharm(unittest.TestCase):
             'tls_protocols': '!SSLv2 !SSLv3',
             'tls_security_level': 'may',
             'transport_maps': '',
+            'virtual_alias_domains': '',
             'virtual_alias_maps': '',
         }
 
@@ -963,6 +964,7 @@ someplace.local encrypt
         get_cn.return_value = ''
         get_milters.return_value = ''
         self.mock_config.return_value['transport_maps'] = '.mydomain.local  smtp:[smtp.mydomain.local]'
+        self.mock_config.return_value['virtual_alias_domains'] = 'mydomain.local mydomain2.local'
         self.mock_config.return_value['virtual_alias_maps'] = '[e-mail] [e-mail]'
         smtp_relay.configure_smtp_relay(self.tmpdir)
         with open(