TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into single_file_link

Browse Source
This commit is contained in:
Neeraj Gupta
2025-07-23 14:12:32 +05:30
parent e443838621 fa1838c82e
commit 4e8fa3babd
133 changed files with 4170 additions and 2013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/pkg/utils/s3config/s3config.go
View File

@@ -136,12 +136,11 @@ func (config *S3Config) initialize() {
Endpoint: aws.String(viper.GetString("s3." + dc + ".endpoint")),
Region: aws.String(viper.GetString("s3." + dc + ".region")),
}
if usePathStyleURLs {
if usePathStyleURLs || viper.GetBool("s3." + dc + ".use_path_style_urls") || areLocalBuckets {
s3Config.S3ForcePathStyle = aws.Bool(true)
}
if areLocalBuckets {
if areLocalBuckets || viper.GetBool("s3." + dc + ".disable_ssl") {
s3Config.DisableSSL = aws.Bool(true)
s3Config.S3ForcePathStyle = aws.Bool(true)
}
s3Session, err := session.NewSession(&s3Config)
if err != nil {