summaryrefslogtreecommitdiffstats
path: root/apps/files_external/tests
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-06-19 22:14:58 +0200
committerThomas Mueller <thomas.mueller@tmit.eu>2013-06-19 22:14:58 +0200
commit0f32c5ec346490e0473d9003de5c796ff0cf92ea (patch)
tree992bb34d79d07ba98878697c667359807f24080a /apps/files_external/tests
parent2772b1dd956078357d5a8f47e520cde484fe30a5 (diff)
parente3171a701d2c88a12ec11cebb5d96ff2fb6cf677 (diff)
downloadnextcloud-server-0f32c5ec346490e0473d9003de5c796ff0cf92ea.tar.gz
nextcloud-server-0f32c5ec346490e0473d9003de5c796ff0cf92ea.zip
Merge branch 'master' into ext-fs-irods-master
Diffstat (limited to 'apps/files_external/tests')
-rw-r--r--apps/files_external/tests/config.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index 1d4f30c713d..bac594b485f 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -1,4 +1,13 @@
<?php
+
+// in case there are private configurations in the users home -> use them
+$privateConfigFile = $_SERVER['HOME'] . '/owncloud-extfs-test-config.php';
+if (file_exists($privateConfigFile)) {
+ $config = include($privateConfigFile);
+ return $config;
+}
+
+// this is now more a template now for your private configurations
return array(
'ftp'=>array(
'run'=>false,