diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e79b28b..b3e4f07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ variables: AWS_SECRET_ACCESS_KEY: ${MINIO_ACCESS_SECRET} S3_BUCKET: villas-web S3_ENDPOINT: http://minio:9000 - + S3_PATHSTYLE: 'true' PORT: 4000 GO_IMAGE: golang:1.13-buster diff --git a/configuration/config.go b/configuration/config.go index dcec201..e1ff52a 100644 --- a/configuration/config.go +++ b/configuration/config.go @@ -96,25 +96,26 @@ func InitConfig() error { } mappings := map[string]string{ - "DB_HOST": "db.host", - "DB_NAME": "db.name", - "DB_USER": "db.user", - "DB_PASS": "db.pass", - "DB_SSLMODE": "db.ssl", - "AMQP_HOST": "amqp.host", - "AMQP_USER": "amqp.user", - "AMQP_PASS": "amqp.pass", - "BASE_HOST": "base.host", - "BASE_PATH": "base.path", - "MODE": "mode", - "PORT": "port", - "ADMIN_USER": "admin.user", - "ADMIN_PASS": "admin.pass", - "ADMIN_MAIL": "admin.mail", - "S3_BUCKET": "s3.bucket", - "S3_ENDPOINT": "s3.endpoint", - "S3_REGION": "s3.region", - "S3_NOSSL": "s3.nossl", + "DB_HOST": "db.host", + "DB_NAME": "db.name", + "DB_USER": "db.user", + "DB_PASS": "db.pass", + "DB_SSLMODE": "db.ssl", + "AMQP_HOST": "amqp.host", + "AMQP_USER": "amqp.user", + "AMQP_PASS": "amqp.pass", + "BASE_HOST": "base.host", + "BASE_PATH": "base.path", + "MODE": "mode", + "PORT": "port", + "ADMIN_USER": "admin.user", + "ADMIN_PASS": "admin.pass", + "ADMIN_MAIL": "admin.mail", + "S3_BUCKET": "s3.bucket", + "S3_ENDPOINT": "s3.endpoint", + "S3_REGION": "s3.region", + "S3_NOSSL": "s3.nossl", + "S3_PATHSTYLE": "s3.pathstyle", } defaults := config.NewStatic(static)