summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-12-10 20:01:52 -0500
committerFrederic Guillot <fred@kanboard.net>2015-12-10 20:01:52 -0500
commit786e360d0b8a18f6810ff798824c6ae3f5583ec0 (patch)
treef703f8fe96f846fa53badc51b08e69dd09220f1d
parentd2f96f294ad647cd072aff3f40257c2f20ace697 (diff)
Try to load config.php from /data if not available
-rw-r--r--ChangeLog1
-rw-r--r--app/common.php2
-rw-r--r--doc/config.markdown2
3 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a2513ab..b94c7e31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ New features:
* Add search query attribute for task link
* Add the possibility to define API token in config file
* Add capability to reopen Gitlab issues
+* Try to load config.php from /data if not available
Version 1.0.21
--------------
diff --git a/app/common.php b/app/common.php
index fe5a7e69..91e24c65 100644
--- a/app/common.php
+++ b/app/common.php
@@ -16,6 +16,8 @@ if (getenv('DATABASE_URL')) {
if (file_exists('config.php')) {
require 'config.php';
+} elseif (file_exists('data'.DIRECTORY_SEPARATOR.'config.php')) {
+ require 'data'.DIRECTORY_SEPARATOR.'config.php';
}
require __DIR__.'/constants.php';
diff --git a/doc/config.markdown b/doc/config.markdown
index e7916454..393efbae 100644
--- a/doc/config.markdown
+++ b/doc/config.markdown
@@ -1,7 +1,7 @@
Config file
===========
-You can customize the default settings of Kanboard by adding a file `config.php` at the project root.
+You can customize the default settings of Kanboard by adding a file `config.php` at the project root or in the `data` folder.
You can also rename the file `config.default.php` to `config.php` and change the desired values.
Enable/Disable debug mode