From 8add2bd87fe1c7302d104b42130809c857c0cfe3 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Fri, 30 Oct 2020 14:26:05 +0100
Subject: [PATCH] Switch over to php.ini file

---
 .envrc.sample               |  2 +-
 compose.yml                 | 10 +++++-----
 uploads.ini.tmpl => php.ini |  0
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename uploads.ini.tmpl => php.ini (100%)

diff --git a/.envrc.sample b/.envrc.sample
index 867cc77..bf5f4df 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -18,7 +18,7 @@ export LOCAL_SETTINGS_CONF_VERSION=v1
 export HTACCESS_CONF_VERSION=v1
 export ENTRYPOINT_CONF_VERSION=v1
 export COMPOSER_LOCAL_CONF_VERSION=v1
-export UPLOAD_INI_VERSION=v1
+export PHP_INI_VERSION=v1
 
 # SAML
 
diff --git a/compose.yml b/compose.yml
index c54c3b8..3f6d80b 100644
--- a/compose.yml
+++ b/compose.yml
@@ -22,8 +22,8 @@ services:
     configs:
       - source: LocalSettings_conf
         target: /var/www/html/LocalSettings.php
-      - source: upload_ini
-        target: /etc/php5/fpm/conf.d/uploads.ini
+      - source: php_ini
+        target: /usr/local/etc/php/conf.d/mediawiki.ini
       - source: entrypoint2_conf
         target: /docker-entrypoint2.sh
         mode: 0555
@@ -105,7 +105,7 @@ configs:
     name: ${STACK_NAME}_entrypoint2_${ENTRYPOINT_CONF_VERSION}
     file: entrypoint.sh.tmpl
     template_driver: golang
-  upload_ini:
-    name: ${STACK_NAME}_upload_ini_${UPLOAD_INI_VERSION}
-    file: uploads.ini.tmpl
+  php_ini:
+    name: ${STACK_NAME}_php_ini_${PHP_INI_VERSION}
+    file: php.ini.tmpl
     template_driver: golang
diff --git a/uploads.ini.tmpl b/php.ini
similarity index 100%
rename from uploads.ini.tmpl
rename to php.ini