Merge ~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master

[Thomas Cuthbert]

We need to proxy the wp-content URLs to swift via apache mod_proxy_http.

[🤖 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.

[Tom Haddon (mthaddon)]

This will need a charm change as well, so leaving this for when barry is able to work on that.

[Barry Price (barryprice)]

Charm change is done:

https://code.launchpad.net/~barryprice/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/383120

So approving this, but will be landing further fixes from my own branch

review: Approve

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

Change successfully merged at revision 8e8af581381fff97e0caa710868dcdbb6ca0b6cd

diff --git a/Dockerfile b/Dockerfile
index 2f08cce..e58cfac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,6 +34,8 @@ COPY ./files/docker-php.conf $APACHE_CONFDIR/conf-available/docker-php.conf
 RUN a2enconf docker-php \
     && a2dismod mpm_event \
     && a2enmod mpm_prefork \
+    && a2enmod proxy \
+    && a2enmod proxy_http \
     && a2enmod rewrite
 
 # Install the main Wordpress code, this will be our only site so /var/www/html is fine
diff --git a/files/docker-php.conf b/files/docker-php.conf
index 283d871..f32d064 100644
--- a/files/docker-php.conf
+++ b/files/docker-php.conf
@@ -1,3 +1,5 @@
+PassEnv SWIFT_URL
+
 <FilesMatch \.php$>
 	SetHandler application/x-httpd-php
 </FilesMatch>
@@ -15,3 +17,6 @@ DirectoryIndex index.php index.html
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule . /index.php [L]
 </Directory>
+
+ProxyPass /wp-content/uploads/ ${SWIFT_URL}
+ProxyPassReverse /wp-content/uploads/ ${SWIFT_URL}