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.

Commit message:
Don't enable swift proxy apache2 config when SWIFT_URL envar is missing

Requested reviews:
  Wordpress Charmers (wordpress-charmers)

For more details, see:
https://code.launchpad.net/~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder/+merge/394677
-- 
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 8da82f4..616a2a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,7 @@ RUN apt-get update && apt-get -y dist-upgrade \
 
 # Configure PHP and apache2 - mod_php requires us to use mpm_prefork
 COPY ./files/docker-php.conf $APACHE_CONFDIR/conf-available/docker-php.conf
+COPY ./files/docker-php-swift-proxy.conf $APACHE_CONFDIR/conf-available/docker-php-swift-proxy.conf
 RUN a2enconf docker-php \
     && a2dismod mpm_event \
     && a2enmod headers \
diff --git a/files/docker-entrypoint.sh b/files/docker-entrypoint.sh
index 4acb037..09d2da8 100644
--- a/files/docker-entrypoint.sh
+++ b/files/docker-entrypoint.sh
@@ -11,6 +11,11 @@ do
     sed -i -e "s/%%%${key}%%%/$(printenv ${key})/" /var/www/html/wp-info.php
 done
 
+set +u
+# If we have passed in SWIFT_URL, then append swift proxy config.
+[ -z "$SWIFT_URL" ] || a2enconf docker-php-swift-proxy
+set -u
+
 nohup bash -c "/srv/wordpress-helpers/plugin_handler.py &"
 
 sed -i 's/max_execution_time = 30/max_execution_time = 300/' /etc/php/7.2/apache2/php.ini
diff --git a/files/docker-php-swift-proxy.conf b/files/docker-php-swift-proxy.conf
new file mode 100644
index 0000000..871df91
--- /dev/null
+++ b/files/docker-php-swift-proxy.conf
@@ -0,0 +1,4 @@
+PassEnv SWIFT_URL
+ProxyPass /wp-content/uploads/ ${SWIFT_URL}
+ProxyPassReverse /wp-content/uploads/ ${SWIFT_URL}
+Timeout 300
diff --git a/files/docker-php.conf b/files/docker-php.conf
index a6091d1..00d1f36 100644
--- a/files/docker-php.conf
+++ b/files/docker-php.conf
@@ -1,5 +1,3 @@
-PassEnv SWIFT_URL
-
 <FilesMatch \.php$>
 	SetHandler application/x-httpd-php
 </FilesMatch>
@@ -21,7 +19,3 @@ 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}
-Timeout 300