diff --git a/cmd/init.go b/cmd/init.go index ff0eeb2..2f7c202 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -452,7 +452,7 @@ func initPostbackMessengers(m *manager.Manager) []messenger.Messenger { func initMediaStore() media.Store { switch provider := ko.String("upload.provider"); provider { case "s3": - var o s3.Opts + var o s3.Opt ko.Unmarshal("upload.s3", &o) up, err := s3.NewS3Store(o) if err != nil { diff --git a/cmd/settings.go b/cmd/settings.go index ae48705..d2a0617 100644 --- a/cmd/settings.go +++ b/cmd/settings.go @@ -42,6 +42,7 @@ type settings struct { UploadProvider string `json:"upload.provider"` UploadFilesystemUploadPath string `json:"upload.filesystem.upload_path"` UploadFilesystemUploadURI string `json:"upload.filesystem.upload_uri"` + UploadS3URL string `json:"upload.s3.url"` UploadS3AwsAccessKeyID string `json:"upload.s3.aws_access_key_id"` UploadS3AwsDefaultRegion string `json:"upload.s3.aws_default_region"` UploadS3AwsSecretAccessKey string `json:"upload.s3.aws_secret_access_key,omitempty"` diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vue index 0d3adfa..d97bfc1 100644 --- a/frontend/src/views/Settings.vue +++ b/frontend/src/views/Settings.vue @@ -18,7 +18,7 @@