Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Supports forced use of S3 virtual-hosted style #30969

Merged
merged 15 commits into from
May 15, 2024
Merged

Supports forced use of S3 virtual-hosted style #30969

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9fdc34b
Support minio virtual host pathlike
dicarne May 13, 2024
fb80fa5
Modify the default lookup method to be the same as before
dicarne May 14, 2024
3727384
Merge branch 'go-gitea:main' into main
dicarne May 14, 2024
5756446
fix incorrect fmt
dicarne May 14, 2024
697982a
Add `VIRTUAL_HOST` to document and app.example.ini.
dicarne May 14, 2024
1306ff6
Change Minio lookup type to enum.
dicarne May 14, 2024
016a884
Fix the error of MINIO_LOOKUP_TYPE in app.example.ini.
dicarne May 14, 2024
792a9c3
Change MINIO_LOOKUP_TYPE to MINIO_BUCKET_LOOKUP_TYPE, make it more pr…
dicarne May 14, 2024
2996267
Fix document incorrect formatting.
dicarne May 14, 2024
d84e92e
Added default value of `MINIO_BUCKET_LOOKUP_TYPE` to getDefaultStorag…
dicarne May 14, 2024
cdbc997
Simplfy BucketLookUpType check.
dicarne May 14, 2024
96171b8
Add option to migrate_storage
dicarne May 15, 2024
49a4f9e
Added MINIO_BUCKET_LOOKUP_TYPE processing of empty strings.
dicarne May 15, 2024
b770c9b
Merge pull request #2 from dicarne/fix_bucketlookup
dicarne May 15, 2024
06c0b0b
Merge branch 'main' into main
KN4CK3R May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/setting/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ type MinioStorageConfig struct {
InsecureSkipVerify bool `ini:"MINIO_INSECURE_SKIP_VERIFY"`
ChecksumAlgorithm string `ini:"MINIO_CHECKSUM_ALGORITHM" json:",omitempty"`
ServeDirect bool `ini:"SERVE_DIRECT"`
VirtualHost bool `ini:"VIRTUAL_HOST"`
}

// Storage represents configuration of storages
Expand Down
13 changes: 9 additions & 4 deletions modules/storage/minio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,16 @@ func NewMinioStorage(ctx context.Context, cfg *setting.Storage) (ObjectStorage,

log.Info("Creating Minio storage at %s:%s with base path %s", config.Endpoint, config.Bucket, config.BasePath)

lookup := minio.BucketLookupAuto
if config.VirtualHost {
lookup = minio.BucketLookupDNS
}
minioClient, err := minio.New(config.Endpoint, &minio.Options{
Creds: credentials.NewStaticV4(config.AccessKeyID, config.SecretAccessKey, ""),
Secure: config.UseSSL,
Transport: &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: config.InsecureSkipVerify}},
Region: config.Location,
Creds: credentials.NewStaticV4(config.AccessKeyID, config.SecretAccessKey, ""),
Secure: config.UseSSL,
Transport: &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: config.InsecureSkipVerify}},
Region: config.Location,
BucketLookup: lookup,
})
if err != nil {
return nil, convertMinioErr(err)
Expand Down