summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-11-17 07:48:21 +0100
committerRemi Collet <remi@remirepo.net>2017-11-17 07:48:21 +0100
commitbfc8bed54c2c63407972c0a0773cf209ca558d33 (patch)
tree0c23be7c78a7908417675e1e82e06d9eb511017e
parent824650d307349f39d158df6149ae243288427a1a (diff)
properly override PHP configuration for install page
-rw-r--r--glpi-httpd.conf5
-rw-r--r--glpi-user.ini2
-rw-r--r--glpi.spec8
3 files changed, 14 insertions, 1 deletions
diff --git a/glpi-httpd.conf b/glpi-httpd.conf
index 6d5b5b9..ddafdb4 100644
--- a/glpi-httpd.conf
+++ b/glpi-httpd.conf
@@ -39,6 +39,11 @@ Alias /glpi /usr/share/glpi
php_value max_execution_time 0
php_value memory_limit -1
</IfModule>
+ <IfModule mod_php7.c>
+ # migration could be very long
+ php_value max_execution_time 0
+ php_value memory_limit -1
+ </IfModule>
</Directory>
<Directory /usr/share/glpi/config>
diff --git a/glpi-user.ini b/glpi-user.ini
new file mode 100644
index 0000000..6e6bd5b
--- /dev/null
+++ b/glpi-user.ini
@@ -0,0 +1,2 @@
+max_execution_time=0
+memory_limit=-1
diff --git a/glpi.spec b/glpi.spec
index c4fc2f2..b4d87a9 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -43,7 +43,7 @@
Name: %{gh_project}
Version: 9.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -61,6 +61,8 @@ Source4: %{name}-nginx.conf
Source5: %{name}-fedora-autoloader.php
# Temporary minify script, waiting for consolidation/robo
Source6: %{name}-minify.php
+# Override PHP configuration for php-fpm
+Source7: %{name}-user.ini
# RPM patch to use /etc/glpi/local_define.php
Patch1: glpi-localdef.patch
@@ -243,6 +245,7 @@ ls lib
cp %{SOURCE2} inc/downstream.php
cp %{SOURCE6} tools/minify.php
+cp %{SOURCE7} install/.user.ini
mkdir vendor
sed -e "s,##DATADIR##,%{_datadir}," \
@@ -502,6 +505,9 @@ fi
%changelog
+* Fri Nov 17 2017 Remi Collet <remi@remirepo.net> - 9.2.1-3
+- properly override PHP configuration for install page
+
* Thu Nov 16 2017 Remi Collet <remi@remirepo.net> - 9.2.1-2
- add dependency on zendframework/zend-serializer