summaryrefslogtreecommitdiffstats
path: root/cron.php
diff options
context:
space:
mode:
authorDamjan Georgievski <gdamjan@gmail.com>2016-07-29 17:47:39 +0200
committerDamjan Georgievski <gdamjan@gmail.com>2016-07-29 17:49:14 +0200
commit982bdb182329602e1776d704a2662bd2ab09bf98 (patch)
treee5b642077e3bf473a2af18ad0334d700e85d2c82 /cron.php
parent696ff90cbee2489bc9befdcea8332f6390deebbc (diff)
downloadnextcloud-server-982bdb182329602e1776d704a2662bd2ab09bf98.tar.gz
nextcloud-server-982bdb182329602e1776d704a2662bd2ab09bf98.zip
introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
nextcloud by default uses the `/config/` directory in the source/application tree for its config file(s). with this commit that directory can be overridden by the `NEXTCLOUD_CONFIG_DIR` environment variable. in uwsgi, you would use the option `--env "NEXTCLOUD_CONFIG_DIR=/tmp/nx-config/"` in apache `SetENV …` and the cli command can be run with: `NEXTCLOUD_CONFIG_DIR=/tmp/nx-config ./occ` (or just use `export` once in the shell). NEXTCLOUD_CONFIG_DIR can be supplied with or without the trailing slash (`/`), but in all cases `$configDir` will have it automatically added if needed. The other changes are several occurrences of `OC::$SERVERROOT . '/config'` to `OC::$configDir`.
Diffstat (limited to 'cron.php')
-rw-r--r--cron.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/cron.php b/cron.php
index b1dedaa84b2..4248157b4c8 100644
--- a/cron.php
+++ b/cron.php
@@ -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;