Merge pull request #1813 from hamuz/develop

Fix remote backing storage
firefly-iii · Oct 23, 2018 · 69fe6ec · 69fe6ec
2 parents 1c8375d + 321676c
commit 69fe6ec
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 52 deletions.
diff --git a/composer.json b/composer.json
@@ -70,7 +70,7 @@
     "league/flysystem-replicate-adapter": "^1.0",
     "league/flysystem-sftp": "^1.0",
     "league/fractal": "^0.17.0",
-    "litipk/flysystem-fallback-adapter": "^0.1.3",
+    "litipk/flysystem-fallback-adapter": "0.1.2",
     "mschindler83/fints-hbci-php": "^1.0",
     "pragmarx/google2fa": "3.*",
     "pragmarx/google2fa-laravel": "0.*",

diff --git a/composer.lock b/composer.lock
diff --git a/config/filesystems.php b/config/filesystems.php
@@ -28,13 +28,13 @@
 
 $exportDisk = [
     'driver' => 'mirror',
-    'disks'  => ['local-upload'],
+    'disks'  => ['local-export'],
 ];
 
 // setting the SFTP host is enough to trigger the SFTP option.
 if ('' !== env('SFTP_HOST', '')) {
-    array_unshift($uploadDisk['disks'], 'sftp-upload');
-    array_unshift($exportDisk['disks'], 'sftp-export');
+    array_push($uploadDisk['disks'], 'sftp-upload');
+    array_push($exportDisk['disks'], 'sftp-export');
 }
 
 return [