wordpress-charmers team mailing list archive

[Thomas Cuthbert <thomas.cuthbert@xxxxxxxxxxxxx>]

Thomas Cuthbert has proposed merging ~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master.

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/wordpress-k8s-image-builder/+merge/382913
-- 
Your team Wordpress Charmers is requested to review the proposed merge of ~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master.

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..17e83ee 100644
--- a/files/docker-php.conf
+++ b/files/docker-php.conf
@@ -15,3 +15,6 @@ DirectoryIndex index.php index.html
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule . /index.php [L]
 </Directory>
+
+ProxyPass /wp-content/uploads/ http://10.24.0.162:8080/v1/AUTH_9f74a604ed67422b8b83597223a89143/WordPress/wp-content/uploads/
+ProxyPassReverse /wp-content/uploads/ http://10.24.0.162:8080/v1/AUTH_9f74a604ed67422b8b83597223a89143/WordPress/wp-content/uploads/