Merge pull request #27874 from bachp/config-env-var

Introduce OWNCLOUD_CONFIG_DIR environment variable
owncloud · Jun 21, 2017 · 5573f77 · 5573f77
2 parents 47e6b0d + e414515
commit 5573f77
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/lib/base.php b/lib/base.php
@@ -128,6 +128,8 @@ public static function initPaths() {
 			self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
 		} elseif(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
 			self::$configDir = OC::$SERVERROOT . '/tests/config/';
+		} elseif($dir = getenv('OWNCLOUD_CONFIG_DIR')) {
+			self::$configDir = rtrim($dir, '/') . '/';
 		} else {
 			self::$configDir = OC::$SERVERROOT . '/config/';
 		}