Merge branch 'change_the_name_of_key' into 'master'

Change the name of the key used for bitbucket importer.

See merge request !1733

2 files changed, 10 insertions, 9 deletions

diff --git a/config/initializers/public_key.rb b/config/initializers/public_key.rb
index 75d74e3625d..e4f09a2d020 100644
--- a/config/initializers/public_key.rb
+++ b/config/initializers/public_key.rb
@@ -1,2 +1,2 @@
-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)
diff --git a/doc/integration/bitbucket.md b/doc/integration/bitbucket.md
index cc6389f5aaf..d82e1f8b41b 100644
--- a/doc/integration/bitbucket.md
+++ b/doc/integration/bitbucket.md
@@ -2,7 +2,7 @@
 
 Import projects from Bitbucket and login to your GitLab instance with your Bitbucket account.
 
-To enable the Bitbucket OmniAuth provider you must register your application with Bitbucket. 
+To enable the Bitbucket OmniAuth provider you must register your application with Bitbucket.
 Bitbucket will generate an application ID and secret key for you to use.
 
 1.  Sign in to Bitbucket.
@@ -19,8 +19,8 @@ Bitbucket will generate an application ID and secret key for you to use.
     - URL: The URL to your GitLab installation. 'https://gitlab.company.com'
 1.  Select "Save".
 
-1.  You should now see a Key and Secret in the list of OAuth customers. 
-    Keep this page open as you continue configuration. 
+1.  You should now see a Key and Secret in the list of OAuth customers.
+    Keep this page open as you continue configuration.
 
 1.  On your GitLab server, open the configuration file.
 
@@ -70,13 +70,13 @@ Bitbucket will generate an application ID and secret key for you to use.
 
 1.  Restart GitLab for the changes to take effect.
 
-On the sign in page there should now be a Bitbucket icon below the regular sign in form. 
-Click the icon to begin the authentication process. Bitbucket will ask the user to sign in and authorize the GitLab application. 
+On the sign in page there should now be a Bitbucket icon below the regular sign in form.
+Click the icon to begin the authentication process. Bitbucket will ask the user to sign in and authorize the GitLab application.
 If everything goes well the user will be returned to GitLab and will be signed in.
 
 ## Bitbucket project import
 
-To allow projects to be imported directly into GitLab, Bitbucket requires two extra setup steps compared to GitHub and GitLab.com. 
+To allow projects to be imported directly into GitLab, Bitbucket requires two extra setup steps compared to GitHub and GitLab.com.
 
 Bitbucket doesn't allow OAuth applications to clone repositories over HTTPS, and instead requires GitLab to use SSH and identify itself using your GitLab server's SSH key.
 
@@ -95,7 +95,7 @@ To allow GitLab to connect to Bitbucket over SSH, you need to add 'bitbucket.org
     ```sh
     The authenticity of host 'bitbucket.org (207.223.240.182)' can't be established.
     RSA key fingerprint is 97:8c:1b:f2:6f:14:6b:5c:3b:ec:aa:46:46:74:7c:40.
-    Are you sure you want to continue connecting (yes/no)? 
+    Are you sure you want to continue connecting (yes/no)?
     ```
 
 1. If the fingerprint matches, type `yes` to continue connecting and have 'bitbucket.org' be added to your known hosts.
@@ -104,7 +104,7 @@ To allow GitLab to connect to Bitbucket over SSH, you need to add 'bitbucket.org
 
 ### 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:
 
@@ -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
     ```
 
+    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**.
 
 2. Restart GitLab to allow it to find the new public key.