Commit da6515dd authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼
Browse files

S3: fix region inconsistency

parent dd746295
......@@ -50,12 +50,14 @@ test:
RABBITMQ_DEFAULT_PASS: villas
MINIO_ROOT_USER: minio-villas
MINIO_ROOT_PASSWORD: minio-villas
MINIO_REGION_NAME: default
AWS_ACCESS_KEY_ID: ${MINIO_ROOT_USER}
AWS_SECRET_ACCESS_KEY: ${MINIO_ROOT_PASSWORD}
S3_BUCKET: villas-web
S3_ENDPOINT: http://minio:9000
S3_PATHSTYLE: 'true'
S3_NOSSL: 'true'
S3_REGION: ${MINIO_REGION_NAME}
AMQP_HOST: rabbitmq:5672
AMQP_USER: villas
AMQP_PASS: villas
......
......@@ -56,7 +56,7 @@ func InitConfig() error {
adminMail = flag.String("admin-mail", "", "Initial admin mail address")
s3Bucket = flag.String("s3-bucket", "", "S3 Bucket for uploading files")
s3Endpoint = flag.String("s3-endpoint", "", "Endpoint of S3 API for file uploads")
s3Region = flag.String("s3-region", "us-east-1", "S3 Region for file uploads")
s3Region = flag.String("s3-region", "default", "S3 Region for file uploads")
s3NoSSL = flag.Bool("s3-nossl", false, "Use encrypted connections to the S3 API")
s3PathStyle = flag.Bool("s3-pathstyle", false, "Use path-style S3 API")
)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment