diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-03-10 12:25:10 +0400 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-03-10 12:25:10 +0400 |
| commit | 3c06020e3ec1e03aeb689c2e12600be1f95091a7 (patch) | |
| tree | 7076646346c2bc663099eba348e2c5aa4d9bfab7 | |
| parent | dfbf57207d2d47a843b514728b7254e76930b20c (diff) | |
| parent | be4806d0314e9b6a4e2487456e4c80b8fac3377b (diff) | |
Merge pull request #2217 from owncloud/mountconfig-location
Store the global mount configuration file in the datadir
| -rwxr-xr-x | apps/files_external/lib/config.php | 6 | ||||
| -rw-r--r-- | lib/files/filesystem.php | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 430269e03d9..11d24045fd9 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -307,8 +307,9 @@ class OC_Mount_Config { $phpFile = OC_User::getHome(OCP\User::getUser()).'/mount.php'; $jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json'; } else { + $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); $phpFile = OC::$SERVERROOT.'/config/mount.php'; - $jsonFile = OC::$SERVERROOT.'/config/mount.json'; + $jsonFile = $datadir . '/mount.json'; } if (is_file($jsonFile)) { $mountPoints = json_decode(file_get_contents($jsonFile), true); @@ -333,7 +334,8 @@ class OC_Mount_Config { if ($isPersonal) { $file = OC_User::getHome(OCP\User::getUser()).'/mount.json'; } else { - $file = OC::$SERVERROOT.'/config/mount.json'; + $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); + $file = $datadir . '/mount.json'; } $content = json_encode($data); @file_put_contents($file, $content); 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')); } |