Merge ~kotodama/charm-postfix-relay/+git/charm-postfix-relay:allow_tls into charm-postfix-relay:master

[Loïc Gomez]

Allow to connect to remotes with TLS even if no specific CA is added

smtp_use_tls is the old Postfix 2.2 config option:
http://www.postfix.org/postconf.5.html#smtp_use_tls

With smtp_tls_security_level = may, it allows to connect with TLS if the remote has the capability and falls back to clear text if TLS fails.

FWIW, bionic is on Postfix 3.x

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

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

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:2effc8bc716fcab8d7b5d95c03ca37bfca44fbbf
https://jenkins.canonical.com/bootstack/job/lp-charm-postfix-relay-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/591/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/209/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-postfix-relay-ci/2//rebuild

review: Needs Fixing (continuous-integration)

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[Erhan Sunar (esunar)]

LGTM

review: Approve

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:2effc8bc716fcab8d7b5d95c03ca37bfca44fbbf
https://jenkins.canonical.com/bootstack/job/lp-charm-postfix-relay-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/610/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/216/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-postfix-relay-ci/4//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:2effc8bc716fcab8d7b5d95c03ca37bfca44fbbf
https://jenkins.canonical.com/bootstack/job/lp-charm-postfix-relay-ci/5/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/611/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/217/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-postfix-relay-ci/5//rebuild

review: Approve (continuous-integration)

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

Change successfully merged at revision 88b5d47b78001553ce685b136686942fac7b06e7

[Loïc Gomez (kotodama)]

Many thanks!

diff --git a/src/lib/charm/postfix/postfix_relay.py b/src/lib/charm/postfix/postfix_relay.py
index 2ec90f5..2ca0ac6 100644
--- a/src/lib/charm/postfix/postfix_relay.py
+++ b/src/lib/charm/postfix/postfix_relay.py
@@ -118,8 +118,6 @@ class PostfixContext:
         """Create the ctxt dictionary from charm config."""
         ctxt = {}
         ctxt["config"] = config()
-        if config("ssl_ca"):
-            ctxt["enable_ssl"] = True
         if config("domain_rewrite_map"):
             ctxt["have_rewrite_maps"] = True
         else:
diff --git a/src/templates/main.cf b/src/templates/main.cf
index 966fec4..5ca0a84 100644
--- a/src/templates/main.cf
+++ b/src/templates/main.cf
@@ -11,10 +11,8 @@ append_dot_mydomain = no
 
 readme_directory = no
 
-{%- if enable_ssl %}
 ### TLS parameters ###
-smtp_use_tls = yes
-{%- endif %}
+smtp_tls_security_level = may
 
 {%- if enable_auth %}
 smtp_sasl_auth_enable = yes