wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #660 from gdamjan/custom-config-dir

Browse source 
introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
This commit is contained in:
Morris Jobke 2016-08-09 10:58:23 +02:00 committed by GitHub
commit 4277051442
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/Controller/SetupController.php
View file

@ -40,7 +40,7 @@ class SetupController {
* @param Setup $setupHelper * @param Setup $setupHelper
*/ */
function __construct(Setup $setupHelper) { function __construct(Setup $setupHelper) {
$this->autoConfigFile = \OC::$SERVERROOT.'/config/autoconfig.php'; $this->autoConfigFile = \OC::$configDir.'autoconfig.php';
$this->setupHelper = $setupHelper; $this->setupHelper = $setupHelper;
} }

2
cron.php
View file

@ -90,7 +90,7 @@ try {
exit(0); exit(0);
} }
$user = posix_getpwuid(posix_getuid()); $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']) { if ($user['name'] !== $configUser['name']) {
echo "Console has to be executed with the same user as the web server is operated" . PHP_EOL; 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; echo "Current user: " . $user['name'] . PHP_EOL;

4
lib/base.php
View file

@ -123,6 +123,8 @@ class OC {
self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/'; self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
} elseif(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) { } elseif(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
self::$configDir = OC::$SERVERROOT . '/tests/config/'; self::$configDir = OC::$SERVERROOT . '/tests/config/';
} elseif($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
self::$configDir = rtrim($dir, '/') . '/';
} else { } else {
self::$configDir = OC::$SERVERROOT . '/config/'; self::$configDir = OC::$SERVERROOT . '/config/';
} }
@ -216,7 +218,7 @@ class OC {
// set the right include path // set the right include path
set_include_path( set_include_path(
OC::$SERVERROOT . '/lib/private' . PATH_SEPARATOR . OC::$SERVERROOT . '/lib/private' . PATH_SEPARATOR .
OC::$SERVERROOT . '/config' . PATH_SEPARATOR . self::$configDir . PATH_SEPARATOR .
OC::$SERVERROOT . '/3rdparty' . PATH_SEPARATOR . OC::$SERVERROOT . '/3rdparty' . PATH_SEPARATOR .
implode(PATH_SEPARATOR, $paths) . PATH_SEPARATOR . implode(PATH_SEPARATOR, $paths) . PATH_SEPARATOR .
get_include_path() . PATH_SEPARATOR . get_include_path() . PATH_SEPARATOR .

2
lib/private/Server.php
View file

@ -616,7 +616,7 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerService('MimeTypeDetector', function (Server $c) { $this->registerService('MimeTypeDetector', function (Server $c) {
return new \OC\Files\Type\Detection( return new \OC\Files\Type\Detection(
$c->getURLGenerator(), $c->getURLGenerator(),
\OC::$SERVERROOT . '/config/', \OC::$configDir,
\OC::$SERVERROOT . '/resources/config/' \OC::$SERVERROOT . '/resources/config/'
); );
}); });