wordpress-charmers team mailing list archive

[Thomas Cuthbert <thomas.cuthbert@xxxxxxxxxxxxx>]

Thomas Cuthbert has proposed merging ~tcuthbert/charm-k8s-wordpress:ss-backends into charm-k8s-wordpress:master.

Commit message:
Enable SSL support for backend servers

Requested reviews:
  Canonical IS Reviewers (canonical-is-reviewers)
  Wordpress Charmers (wordpress-charmers)

For more details, see:
https://code.launchpad.net/~tcuthbert/charm-k8s-wordpress/+git/charm-k8s-wordpress-1/+merge/401225
-- 
Your team Wordpress Charmers is requested to review the proposed merge of ~tcuthbert/charm-k8s-wordpress:ss-backends into charm-k8s-wordpress:master.

diff --git a/Dockerfile b/Dockerfile
index 50a5120..21e3b76 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,7 +59,8 @@ RUN a2enconf docker-php \
     && a2enmod mpm_prefork \
     && a2enmod proxy \
     && a2enmod proxy_http \
-    && a2enmod rewrite
+    && a2enmod rewrite \
+    && a2enmod ssl
 
 # Install the main Wordpress code, this will be our only site so /var/www/html is fine
 RUN curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${VERSION}.tar.gz"; \
diff --git a/image-builder/files/docker-php-swift-proxy.conf b/image-builder/files/docker-php-swift-proxy.conf
index 871df91..ea8e989 100644
--- a/image-builder/files/docker-php-swift-proxy.conf
+++ b/image-builder/files/docker-php-swift-proxy.conf
@@ -1,3 +1,4 @@
+SSLProxyEngine on
 PassEnv SWIFT_URL
 ProxyPass /wp-content/uploads/ ${SWIFT_URL}
 ProxyPassReverse /wp-content/uploads/ ${SWIFT_URL}