Merge pull request #2310 from brunoleon/fix_bitbucket

Set default value for BITBUCKET_URL

Author: Sameer Naik

README.md

@@ -1047,6 +1047,7 @@ Below is the complete list of available options that can be used to customize yo
 | `OAUTH_GITLAB_APP_SECRET` | GitLab App Client secret. No defaults. |
 | `OAUTH_BITBUCKET_API_KEY` | BitBucket App Client ID. No defaults. |
 | `OAUTH_BITBUCKET_APP_SECRET` | BitBucket App Client secret. No defaults. |
+| `OAUTH_BITBUCKET_URL` | Bitbucket URL. Defaults: https://bitbucket.org/ |
 | `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL` | The URL at which the SAML assertion should be received. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}/users/auth/saml/callback` else defaults to `http://${GITLAB_HOST}/users/auth/saml/callback`. |
 | `OAUTH_SAML_IDP_CERT_FINGERPRINT` | The SHA1 fingerprint of the certificate. No Defaults. |
 | `OAUTH_SAML_IDP_SSO_TARGET_URL` | The URL to which the authentication request should be sent. No defaults. |

assets/runtime/config/gitlabhq/gitlab.yml

@@ -928,7 +928,8 @@ production: &base
           args: { scope: '{{OAUTH_GITHUB_SCOPE}}' } }
       - { name: 'bitbucket',
           app_id: '{{OAUTH_BITBUCKET_API_KEY}}',
-          app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}' }
+          app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}',
+          url: '{{OAUTH_BITBUCKET_URL}}'}
       - { name: 'gitlab',
           label: 'GitLab.com',
           app_id: '{{OAUTH_GITLAB_API_KEY}}',

assets/runtime/env-defaults

@@ -403,6 +403,7 @@ OAUTH_GITLAB_SCOPE=${OAUTH_GITLAB_SCOPE:-api}
 ### BITBUCKET
 OAUTH_BITBUCKET_API_KEY=${OAUTH_BITBUCKET_API_KEY:-}
 OAUTH_BITBUCKET_APP_SECRET=${OAUTH_BITBUCKET_APP_SECRET:-}
+OAUTH_BITBUCKET_URL=${OAUTH_BITBUCKET_URL:-https://bitbucket.org/}
 
 ### CROWD
 OAUTH_CROWD_SERVER_URL=${OAUTH_CROWD_SERVER_URL:-}

assets/runtime/functions

@@ -553,7 +553,8 @@ gitlab_configure_oauth_bitbucket() {
     OAUTH_ENABLED=${OAUTH_ENABLED:-true}
     update_template ${GITLAB_CONFIG} \
       OAUTH_BITBUCKET_API_KEY \
-      OAUTH_BITBUCKET_APP_SECRET
+      OAUTH_BITBUCKET_APP_SECRET \
+      OAUTH_BITBUCKET_URL
   else
     exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_APP_SECRET}}/d" ${GITLAB_CONFIG}
   fi

contrib/docker-swarm/docker-compose.yml

@@ -127,6 +127,7 @@ services:
 
     - OAUTH_BITBUCKET_API_KEY=
     - OAUTH_BITBUCKET_APP_SECRET=
+    - OAUTH_BITBUCKET_URL=
 
     - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
     - OAUTH_SAML_IDP_CERT_FINGERPRINT=

docker-compose.swarm.yml

@@ -189,6 +189,7 @@ services:
 
     - OAUTH_BITBUCKET_API_KEY=
     - OAUTH_BITBUCKET_APP_SECRET=
+    - OAUTH_BITBUCKET_URL=
 
     - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
     - OAUTH_SAML_IDP_CERT_FINGERPRINT=

docker-compose.yml

@@ -129,6 +129,7 @@ services:
 
     - OAUTH_BITBUCKET_API_KEY=
     - OAUTH_BITBUCKET_APP_SECRET=
+    - OAUTH_BITBUCKET_URL=
 
     - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
     - OAUTH_SAML_IDP_CERT_FINGERPRINT=

docs/docker-compose-keycloak.yml

@@ -123,6 +123,7 @@ services:
 
     - OAUTH_BITBUCKET_API_KEY=
     - OAUTH_BITBUCKET_APP_SECRET=
+    - OAUTH_BITBUCKET_URL=
 
     - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
     - OAUTH_SAML_IDP_CERT_FINGERPRINT=

docs/s3_compatible_storage.md

@@ -174,6 +174,7 @@ services:
     - OAUTH_GITLAB_APP_SECRET=
     - OAUTH_BITBUCKET_API_KEY=
     - OAUTH_BITBUCKET_APP_SECRET=
+    - OAUTH_BITBUCKET_URL=
     - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
     - OAUTH_SAML_IDP_CERT_FINGERPRINT=
     - OAUTH_SAML_IDP_SSO_TARGET_URL=