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:
Setting headers requires mod_headers enabled & Request thresholds adjusted for WordPress importer

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/385089
-- 
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 5dc023c..66bafe0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,6 +33,7 @@ RUN apt-get update && apt-get -y dist-upgrade \
 COPY ./files/docker-php.conf $APACHE_CONFDIR/conf-available/docker-php.conf
 RUN a2enconf docker-php \
     && a2dismod mpm_event \
+    && a2enmod headers \
     && a2enmod mpm_prefork \
     && a2enmod proxy \
     && a2enmod proxy_http \
diff --git a/files/docker-entrypoint.sh b/files/docker-entrypoint.sh
index 136a0d5..4442e8c 100644
--- a/files/docker-entrypoint.sh
+++ b/files/docker-entrypoint.sh
@@ -13,4 +13,7 @@ done
 
 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
+sed -i'' 's/upload_max_filesize = 2M/upload_max_filesize = 10M/' /etc/php/7.2/apache2/php.ini
+
 exec "$@"
diff --git a/files/docker-php.conf b/files/docker-php.conf
index 3c1ccf2..a6091d1 100644
--- a/files/docker-php.conf
+++ b/files/docker-php.conf
@@ -24,3 +24,4 @@ DirectoryIndex index.php index.html
 
 ProxyPass /wp-content/uploads/ ${SWIFT_URL}
 ProxyPassReverse /wp-content/uploads/ ${SWIFT_URL}
+Timeout 300