Commit 52c3a3a0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'change_the_name_of_key' into 'master'

Change the name of the key used for bitbucket importer.

See merge request !1733
parents 5738afdb 603b88ab
path = File.expand_path("~/.ssh/id_rsa.pub") path = File.expand_path("~/.ssh/bitbucket_rsa.pub")
Gitlab::BitbucketImport.public_key = File.read(path) if File.exist?(path) Gitlab::BitbucketImport.public_key = File.read(path) if File.exist?(path)
...@@ -104,7 +104,7 @@ To allow GitLab to connect to Bitbucket over SSH, you need to add 'bitbucket.org ...@@ -104,7 +104,7 @@ To allow GitLab to connect to Bitbucket over SSH, you need to add 'bitbucket.org
### Step 2: Public key ### Step 2: 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/id_rsa.pub`, which will expand to `/home/git/.ssh/id_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 `/home/git/.ssh/bitbucket_rsa.pub` in most configurations.
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: 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:
...@@ -114,6 +114,7 @@ If you have that file in place, you're all set and should see the "Import projec ...@@ -114,6 +114,7 @@ If you have that file in place, you're all set and should see the "Import projec
sudo -u git -H ssh-keygen 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`.
Make sure to use an **empty passphrase**. Make sure to use an **empty passphrase**.
2. Restart GitLab to allow it to find the new public key. 2. Restart GitLab to allow it to find the new public key.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment