diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-03-10 00:25:10 -0800 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-03-10 00:25:10 -0800 |
| commit | 3c06020e3ec1e03aeb689c2e12600be1f95091a7 (patch) | |
| tree | 7076646346c2bc663099eba348e2c5aa4d9bfab7 /lib | |
| parent | dfbf57207d2d47a843b514728b7254e76930b20c (diff) | |
| parent | be4806d0314e9b6a4e2487456e4c80b8fac3377b (diff) | |
| download | nextcloud-server-3c06020e3ec1e03aeb689c2e12600be1f95091a7.tar.gz nextcloud-server-3c06020e3ec1e03aeb689c2e12600be1f95091a7.zip | |
Merge pull request #2217 from owncloud/mountconfig-location
Store the global mount configuration file in the datadir
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/files/filesystem.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index 0bbd7550d74..40fef674a00 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -221,11 +221,16 @@ class Filesystem { $root = \OC_User::getHome($user); self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user); + $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); + //move config file to it's new position + if (is_file(\OC::$SERVERROOT . '/config/mount.json')) { + rename(\OC::$SERVERROOT . '/config/mount.json', $datadir . '/mount.json'); + } // Load system mount points - if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file(\OC::$SERVERROOT . '/config/mount.json')) { - if (is_file(\OC::$SERVERROOT . '/config/mount.json')) { - $mountConfig = json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mount.json'), true); + if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file($datadir . '/mount.json')) { + if (is_file($datadir . '/mount.json')) { + $mountConfig = json_decode(file_get_contents($datadir . '/mount.json'), true); } elseif (is_file(\OC::$SERVERROOT . '/config/mount.php')) { $mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php')); } |