diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-08-09 10:58:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 10:58:23 +0200 |
| commit | 4277051442c2b6025da936493cb674dcf754d34c (patch) | |
| tree | 5d464276d9a452688ccf2264b34aaeca8d7d7d26 | |
| parent | 3a26def7cf446bbf8bb019ebc4ac30cfe4d27151 (diff) | |
| parent | 4d559267bd19d67a1d0661f8a1658268652dea92 (diff) | |
| download | nextcloud-server-4277051442c2b6025da936493cb674dcf754d34c.tar.gz nextcloud-server-4277051442c2b6025da936493cb674dcf754d34c.zip | |
Merge pull request #660 from gdamjan/custom-config-dir
introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
| -rw-r--r-- | core/Controller/SetupController.php | 2 | ||||
| -rw-r--r-- | cron.php | 2 | ||||
| -rw-r--r-- | lib/base.php | 4 | ||||
| -rw-r--r-- | lib/private/Server.php | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php index fc1efe4c11b..bb7c8c4969d 100644 --- a/core/Controller/SetupController.php +++ b/core/Controller/SetupController.php @@ -40,7 +40,7 @@ class SetupController { * @param Setup $setupHelper */ function __construct(Setup $setupHelper) { - $this->autoConfigFile = \OC::$SERVERROOT.'/config/autoconfig.php'; + $this->autoConfigFile = \OC::$configDir.'autoconfig.php'; $this->setupHelper = $setupHelper; } @@ -90,7 +90,7 @@ try { exit(0); } $user = posix_getpwuid(posix_getuid()); - $configUser = posix_getpwuid(fileowner(OC::$SERVERROOT . '/config/config.php')); + $configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php')); if ($user['name'] !== $configUser['name']) { echo "Console has to be executed with the same user as the web server is operated" . PHP_EOL; echo "Current user: " . $user['name'] . PHP_EOL; diff --git a/lib/base.php b/lib/base.php index 4bb7052aa5d..3457a74e989 100644 --- a/lib/base.php +++ b/lib/base.php @@ -123,6 +123,8 @@ class OC { 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('NEXTCLOUD_CONFIG_DIR')) { + self::$configDir = rtrim($dir, '/') . '/'; } else { self::$configDir = OC::$SERVERROOT . '/config/'; } @@ -216,7 +218,7 @@ class OC { // set the right include path set_include_path( OC::$SERVERROOT . '/lib/private' . PATH_SEPARATOR . - OC::$SERVERROOT . '/config' . PATH_SEPARATOR . + self::$configDir . PATH_SEPARATOR . OC::$SERVERROOT . '/3rdparty' . PATH_SEPARATOR . implode(PATH_SEPARATOR, $paths) . PATH_SEPARATOR . get_include_path() . PATH_SEPARATOR . diff --git a/lib/private/Server.php b/lib/private/Server.php index fd6ecdc297e..d5808d7f17c 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -616,7 +616,7 @@ class Server extends ServerContainer implements IServerContainer { $this->registerService('MimeTypeDetector', function (Server $c) { return new \OC\Files\Type\Detection( $c->getURLGenerator(), - \OC::$SERVERROOT . '/config/', + \OC::$configDir, \OC::$SERVERROOT . '/resources/config/' ); }); |