mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-03 17:29:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat: add uppy companion url config

Browse Source
This commit is contained in:
Jannik Stehle
2023-06-06 12:08:33 +02:00
parent fdb4d6e12f
commit 74ca24d3ff
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/pkg/config/defaults/defaultconfig.go
+1 -1
View File
@@ -194,7 +194,7 @@ func Sanitize(cfg *config.Config) {
cfg.Web.Config.Options.FeedbackLink = nil
}
// remove Upload parent if no value is set
if cfg.Web.Config.Options.Upload.XHR.Timeout == 0 {
if cfg.Web.Config.Options.Upload.XHR.Timeout == 0 && cfg.Web.Config.Options.Upload.CompanionURL == "" {
cfg.Web.Config.Options.Upload = nil
}
}
services/web/pkg/config/options.go
+2 -1
View File
@@ -51,7 +51,8 @@ type Routing struct {
// Upload are the upload options
type Upload struct {
XHR XHR `json:"xhr,omitempty" yaml:"xhr"`
XHR XHR `json:"xhr,omitempty" yaml:"xhr"`
CompanionURL string `json:"companionUrl,omitempty" yaml:"companionUrl" env:"WEB_OPTION_UPLOAD_COMPANION_URL" desc:"Sets the URL of Companion which is a service provided by Uppy to import files from external cloud providers. See https://uppy.io/docs/companion/ for instructions on how to set up Companion. This feature is disabled as long as no URL is given."`
}
// XHR are the XHR options