summaryrefslogtreecommitdiffstats
path: root/glpi-localdef.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-10-11 10:38:04 +0200
committerRemi Collet <remi@remirepo.net>2017-10-11 10:38:04 +0200
commit46a4d7ed34b4c3b64f341b00809d293a495e33a4 (patch)
tree72ca067eb93bce116fc3dc6ed7ad64affba6fee9 /glpi-localdef.patch
parent1c2030a0ce92e3cc947b4e1f212631399e7ce435 (diff)
move config/config_path.php to inc/downstream.php
use /etc/glpi/local_define.php to allow local path change
Diffstat (limited to 'glpi-localdef.patch')
-rw-r--r--glpi-localdef.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/glpi-localdef.patch b/glpi-localdef.patch
new file mode 100644
index 0000000..7b7be8d
--- /dev/null
+++ b/glpi-localdef.patch
@@ -0,0 +1,16 @@
+diff -up ./inc/based_config.php.rpm ./inc/based_config.php
+--- ./inc/based_config.php.rpm 2017-10-11 09:59:42.446010854 +0200
++++ ./inc/based_config.php 2017-10-11 10:11:47.457934585 +0200
+@@ -46,9 +46,9 @@ if (!empty($tz)) {
+ date_default_timezone_set(@date_default_timezone_get());
+ }
+
+-// If this file exists, it is load
+-if (file_exists(GLPI_ROOT. '/config/local_define.php')) {
+- require_once GLPI_ROOT. '/config/local_define.php';
++// If this file exists, it is load from etc (RPM specific)
++if (file_exists('/etc/glpi/local_define.php')) {
++ require_once '/etc/glpi/local_define.php';
+ }
+
+ // If this file exists, it is load, allow to set configdir/dumpdir elsewhere