Merge ~nick-moffitt/squid-reverseproxy-charm:squid4 into squid-reverseproxy-charm:master

[Nick Moffitt]

Make the https_port line squid4-compatible

The only https-capable version of squid before this was a series of
custom builds in PPAs. Thus it makes sense for the charm to now focus
on HTTPS capabilities that exist only in currently-maintained
Debian/Ubuntu packages of squid.

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[🤖 Canonical IS Review Bot (canonical-is-reviewbot)]

Proxy approval for alejdg

review: Approve

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

Change successfully merged at revision d28106987d1900383012a840b9c411d02fb41b95

diff --git a/templates/main_config.template b/templates/main_config.template
index b331488..d4a807d 100644
--- a/templates/main_config.template
+++ b/templates/main_config.template
@@ -1,7 +1,7 @@
 visible_hostname {{ visible_hostname }}
 http_port {{ config.port }} {{ config.port_options }}
 {% if config.enable_https -%}
-https_port {{ config.https_port }} {{ config.https_options }} cert={{ config.ssl_certfile }} key={{ config.ssl_keyfile }} options={{ config.ssl_options }} cipher={{ config.ssl_cipher_suite }} dhparams={{ dhparams_file }}
+https_port {{ config.https_port }} {{ config.https_options }} tls-cert={{ config.ssl_certfile }} tls-key={{ config.ssl_keyfile }} 
 {% endif -%}
 
 {% if need_localacl_defs < 0 -%}