From adf79a6c112d0b50e71256a90b8a297b82833968 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 10 Mar 2021 13:42:54 +0530 Subject: [PATCH] functions: properly delete the bitbucket auth config when not in use --- assets/runtime/config/gitlabhq/gitlab.yml | 2 +- assets/runtime/functions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index eaa2cdad..c39311e8 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -929,7 +929,7 @@ production: &base - { name: 'bitbucket', app_id: '{{OAUTH_BITBUCKET_API_KEY}}', app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}', - url: '{{OAUTH_BITBUCKET_URL}}'} + url: '{{OAUTH_BITBUCKET_URL}}' } - { name: 'gitlab', label: 'GitLab.com', app_id: '{{OAUTH_GITLAB_API_KEY}}', diff --git a/assets/runtime/functions b/assets/runtime/functions index 72465e38..7d65ae1f 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -556,7 +556,7 @@ gitlab_configure_oauth_bitbucket() { OAUTH_BITBUCKET_APP_SECRET \ OAUTH_BITBUCKET_URL else - exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_APP_SECRET}}/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_URL}}/d" ${GITLAB_CONFIG} fi }