Merge pull request #33692 from nextcloud/update-dir

Document and use the new updateDirectory if set
nextcloud · Sep 2, 2022 · 16e696c · 16e696c
2 parents 6132b6a + 771431c
commit 16e696c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/config/config.sample.php b/config/config.sample.php
@@ -1768,6 +1768,15 @@
  */
 'tempdirectory' => '/tmp/nextcloudtemp',
 
+/**
+ * Override where Nextcloud stores update files while updating. Useful in situations
+ * where the default `datadirectory` is on network disk like NFS, or is otherwise
+ * restricted. Defaults to the value of `datadirectory` if unset.
+ *
+ * The Web server user must have write access to this directory.
+ */
+'updatedirectory' => '',
+
 /**
  * Hashing
  */

diff --git a/lib/private/Repair/MoveUpdaterStepFile.php b/lib/private/Repair/MoveUpdaterStepFile.php
@@ -43,14 +43,14 @@ public function getName() {
 	}
 
 	public function run(IOutput $output) {
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+		$updateDir = $this->config->getSystemValue('updatedirectory') ?? $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
 		$instanceId = $this->config->getSystemValue('instanceid', null);
 
 		if (!is_string($instanceId) || empty($instanceId)) {
 			return;
 		}
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
+		$updaterFolderPath = $updateDir . '/updater-' . $instanceId;
 		$stepFile = $updaterFolderPath . '/.step';
 		if (file_exists($stepFile)) {
 			$output->info('.step file exists');