IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-25 02:10:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some mild refactoring for #1787

Browse Source
This commit is contained in:
James Cole 2018-10-14 08:53:00 +02:00
parent 91ef21a665
commit 53db8912d6
2 changed files with 71 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.env.example
View File

@ -49,6 +49,21 @@ DB_PASSWORD=secret
CACHE_DRIVER=file CACHE_DRIVER=file
SESSION_DRIVER=file SESSION_DRIVER=file
# You can configure another file storage backend if you cannot use the local storage option.
# To set this up, fill in the following variables. The upload path is used to store uploaded
# files and the export path is to store exported data (before download).
SFTP_HOST=
SFTP_PORT=
SFTP_UPLOAD_PATH=
SFTP_EXPORT_PATH=
# SFTP uses either the username/password combination or the private key to authenticate.
SFTP_USERNAME=
SFTP_PASSWORD=
SFTP_PRIV_KEY=
# Cookie settings. Should not be necessary to change these. # Cookie settings. Should not be necessary to change these.
COOKIE_PATH="/" COOKIE_PATH="/"
COOKIE_DOMAIN= COOKIE_DOMAIN=

106
config/filesystems.php
View File

@ -21,19 +21,20 @@
declare(strict_types=1); declare(strict_types=1);
$upload_disk = [ $uploadDisk = [
'driver' => 'mirror', 'driver' => 'mirror',
'disks' => ['local-upload'], 'disks' => ['local-upload'],
]; ];
$export_disk = [ $exportDisk = [
'driver' => 'mirror', 'driver' => 'mirror',
'disks' => ['local-upload'], 'disks' => ['local-upload'],
]; ];
if ('' !== env('SFTP_HOST','') && '' !== env('SFTP_FIREFLY_ROOT','')) { // setting the SFTP host is enough to trigger the SFTP option.
$upload_disk['disks'][] = "sftp-upload"; if ('' !== env('SFTP_HOST', '')) {
$export_disk['disks'][] = "sftp-export"; $uploadDisk['disks'][] = 'sftp-upload';
$exportDisk['disks'][] = 'sftp-export';
} }
@ -83,21 +84,59 @@ return [
*/ */
'disks' => [ 'disks' => [
'local' => [ 'local' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('app'), 'root' => storage_path('app'),
], ],
'local-upload' => [ // local storage configuration for upload and export:
'local-upload' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('upload'), 'root' => storage_path('upload'),
], ],
'local-export' => [ 'local-export' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('export'), 'root' => storage_path('export'),
], ],
// SFTP storage configuration for upload and export:
'sftp-upload' => [
'driver' => 'sftp',
'host' => env('SFTP_HOST', '127.0.0.1'),
'port' => env('SFTP_PORT', 22),
'username' => env('SFTP_USERNAME', 'anonymous'),
'password' => env('SFTP_PASSWORD', ''),
'root' => env('SFTP_UPLOAD_PATH', ''),
'privateKey' => env('SFTP_PRIV_KEY'),
// Optional SFTP Settings
// 'timeout' => 30,
// 'directoryPerm' => 0755,
// 'permPublic' => 0644,
// 'permPrivate' => 0600,
],
'sftp-export' => [
'driver' => 'sftp',
'host' => env('SFTP_HOST', '127.0.0.1'),
'port' => env('SFTP_PORT', 22),
'username' => env('SFTP_USERNAME', 'anonymous'),
'password' => env('SFTP_PASSWORD', ''),
'root' => env('SFTP_EXPORT_PATH', ''),
'privateKey' => env('SFTP_PRIV_KEY'),
// Optional SFTP Settings
// 'timeout' => 30,
// 'directoryPerm' => 0755,
// 'permPublic' => 0644,
// 'permPrivate' => 0600,
],
// final configuration of upload disk and export disk.
'upload' => $uploadDisk,
'export' => $exportDisk,
// various other paths:
'database' => [ 'database' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('database'), 'root' => storage_path('database'),
@ -118,6 +157,9 @@ return [
'visibility' => 'public', 'visibility' => 'public',
], ],
// unused storage backends.
/*
's3' => [ 's3' => [
'driver' => 's3', 'driver' => 's3',
'key' => env('AWS_KEY'), 'key' => env('AWS_KEY'),
@ -125,43 +167,7 @@ return [
'region' => env('AWS_REGION'), 'region' => env('AWS_REGION'),
'bucket' => env('AWS_BUCKET'), 'bucket' => env('AWS_BUCKET'),
], ],
'sftp-upload' => [
'driver' => 'sftp',
'host' => env('SFTP_HOST'),
'port' => env('SFTP_PORT', 22),
'username' => env('SFTP_USERNAME'),
'password' => env('SFTP_PASSWORD'),
'root' => env('SFTP_FIREFLY_ROOT') . '/upload',
// Optional SFTP Settings
// 'privateKey' => 'path/to/or/contents/of/privatekey',
// 'port' => 22,
// 'timeout' => 30,
// 'directoryPerm' => 0755,
// 'permPublic' => 0644,
// 'permPrivate' => 0600,
],
'upload' => $upload_disk,
'sftp-export' => [
'driver' => 'sftp',
'host' => env('SFTP_HOST'),
'port' => env('SFTP_PORT', 22),
'username' => env('SFTP_USERNAME'),
'password' => env('SFTP_PASSWORD'),
'root' => env('SFTP_FIREFLY_ROOT') . '/export',
// Optional SFTP Settings
// 'privateKey' => 'path/to/or/contents/of/privatekey',
// 'timeout' => 30,
// 'directoryPerm' => 0755,
// 'permPublic' => 0644,
// 'permPrivate' => 0600,
],
'export' => $upload_export,
/*
'sftp' => [ 'sftp' => [
'driver' => 'sftp', 'driver' => 'sftp',
'host' => 'sftp.example.com', 'host' => 'sftp.example.com',
@ -479,7 +485,7 @@ return [
], ],
*/ */
], ],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Automatically Register Stream Wrappers | Automatically Register Stream Wrappers