From cfa1fe2e28f98d936eeffe8d9416e5cdd439398a Mon Sep 17 00:00:00 2001 From: Akanoa Date: Sat, 3 Jul 2021 17:45:56 +0000 Subject: [PATCH] fix: bad default value --- assets/runtime/config/gitlabhq/gitlab.yml | 2 +- assets/runtime/env-defaults | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index b8ddc621..236c27b7 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -326,7 +326,7 @@ production: &base object_store: enabled: {{GITLAB_PACKAGES_OBJECT_STORE_ENABLED}} remote_directory: {{GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name - direct_upload: {{GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage. + direct_upload: {{GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Packages without the need of local shared storage. background_upload: {{GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true) proxy_download: {{GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage connection: diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 32a4a432..3674ad17 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -107,10 +107,10 @@ GITLAB_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_OBJECT_STORE_CONNECTION_PROVIDE #-- AWS AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID} AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY} -AWS_HOST=${AWS_REGION:-us-east-1} +AWS_REGION=${AWS_REGION:-us-east-1} AWS_HOST=${AWS_HOST:-s3.amazonaws.com} -AWS_ENDPOINT=${AWS_ENDPOINT:nil} -AWS_ENDPOINT=${AWS_PATH_STYLE:true} +AWS_ENDPOINT=${AWS_ENDPOINT:-nil} +AWS_PATH_STYLE=${AWS_PATH_STYLE:-true} #-- Google GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}