summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorRaphaƫl Doursenaud <rdoursenaud@gpcsolutions.fr>2015-07-30 12:55:25 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-30 13:19:37 +0200
commitc6d27652923ca287ab1ef29de3e2f4ab9117b121 (patch)
tree92141050330ff031df4cf93edcefd394201540a7 /doc/integration
parent475afd37b656fa87e8f528670091a1923e391cef (diff)
downloadgitlab-ce-c6d27652923ca287ab1ef29de3e2f4ab9117b121.tar.gz
Updated Bitbucket OmniAuth documentation for omnibus package
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/bitbucket.md12
1 files changed, 10 insertions, 2 deletions
diff --git a/doc/integration/bitbucket.md b/doc/integration/bitbucket.md
index 0078f4e15b2..94c845c29a4 100644
--- a/doc/integration/bitbucket.md
+++ b/doc/integration/bitbucket.md
@@ -92,7 +92,7 @@ Bitbucket doesn't allow OAuth applications to clone repositories over HTTPS, and
### Step 1: Public key
-To be able to access repositories on Bitbucket, GitLab will automatically register your public key with Bitbucket as a deploy key for the repositories to be imported. Your public key needs to be at `~/.ssh/bitbucket_rsa.pub`, which will expand to `/home/git/.ssh/bitbucket_rsa.pub` in most configurations.
+To be able to access repositories on Bitbucket, GitLab will automatically register your public key with Bitbucket as a deploy key for the repositories to be imported. Your public key needs to be at `~/.ssh/bitbucket_rsa.pub`, which will expand to `/var/opt/gitlab/.ssh/bitbucket_rsa` for omnibus package and to `/home/git/.ssh/bitbucket_rsa.pub` for installations from source.
If you have that file in place, you're all set and should see the "Import projects from Bitbucket" option enabled. If you don't, do the following:
@@ -102,12 +102,20 @@ If you have that file in place, you're all set and should see the "Import projec
sudo -u git -H ssh-keygen
```
- When asked `Enter file in which to save the key` specify the correct path, eg. `/home/git/.ssh/bitbucket_rsa`.
+ When asked `Enter file in which to save the key` specify the correct path, eg. `/var/opt/gitlab/.ssh/bitbucket_rsa` or `/home/git/.ssh/bitbucket_rsa`.
Make sure to use an **empty passphrase**.
1. Configure SSH client to use your new key:
Open the SSH configuration file of the git user.
+
+ For omnibus package:
+
+ ```sh
+ sudo editor /var/opt/gitlab/.ssh/config
+ ```
+
+ For installations from source:
```sh
sudo editor /home/git/.ssh/config