self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

All: Improved S3 sync error handling and reliability, and upgraded S3 SDK (#5312)

Browse Source
This commit is contained in:
Lee Matos
2021-11-24 18:03:03 -05:00
committed by GitHub
parent 8e54a65ca5
commit 5981227c06
16 changed files with 35302 additions and 23496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/lib/models/Setting.ts
View File

@@ -503,7 +503,7 @@ class Setting extends BaseModel {
return value ? rtrimSlashes(value) : '';
},
public: true,
label: () => _('AWS S3 bucket'),
label: () => _('S3 bucket'),
description: () => emptyDirWarning,
storage: SettingStorage.File,
},
@@ -514,8 +514,25 @@ class Setting extends BaseModel {
show: (settings: any) => {
return settings['sync.target'] == SyncTargetRegistry.nameToId('amazon_s3');
},
filter: value => {
return value ? value.trim() : '';
},
public: true,
label: () => _('AWS S3 URL'),
label: () => _('S3 URL'),
storage: SettingStorage.File,
},
'sync.8.region': {
value: '',
type: SettingItemType.String,
section: 'sync',
show: (settings: any) => {
return settings['sync.target'] == SyncTargetRegistry.nameToId('amazon_s3');
},
filter: value => {
return value ? value.trim() : '';
},
public: true,
label: () => _('Region'),
storage: SettingStorage.File,
},
'sync.8.username': {
@@ -526,7 +543,7 @@ class Setting extends BaseModel {
return settings['sync.target'] == SyncTargetRegistry.nameToId('amazon_s3');
},
public: true,
label: () => _('AWS key'),
label: () => _('Access Key'),
storage: SettingStorage.File,
},
'sync.8.password': {
@@ -537,10 +554,20 @@ class Setting extends BaseModel {
return settings['sync.target'] == SyncTargetRegistry.nameToId('amazon_s3');
},
public: true,
label: () => _('AWS secret'),
label: () => _('Secret Key'),
secure: true,
},
'sync.8.forcePathStyle': {
value: false,
type: SettingItemType.Bool,
section: 'sync',
show: (settings: any) => {
return settings['sync.target'] == SyncTargetRegistry.nameToId('amazon_s3');
},
public: true,
label: () => _('Force Path Style'),
storage: SettingStorage.File,
},
'sync.9.path': {
value: '',
type: SettingItemType.String,