From e712583a5e0c3fdb74abcd7c394237354edb3b45 Mon Sep 17 00:00:00 2001
From: Patricio Cano <patricio@gitlab.com>
Date: Wed, 29 Oct 2014 17:21:55 -0500
Subject: [PATCH] Improved rake documentation for importing existing
 repositories with a rake task.

---
 doc/raketasks/import.md | 51 +++++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 7 deletions(-)

diff --git a/doc/raketasks/import.md b/doc/raketasks/import.md
index 5dba8de6d56..e7dc4138f6f 100644
--- a/doc/raketasks/import.md
+++ b/doc/raketasks/import.md
@@ -11,18 +11,55 @@ Notes:
 
 How to use:
 
-1. copy your bare repos under git repos_path (see `config/gitlab.yml` gitlab_shell -> repos_path)
-1. run the command below
+1. Create a new folder inside the git repositories path.
+
+- For omnibus-gitlab it is located at: `/var/opt/gitlab/git-data/repositories`
+- For manual installations it is usually located at: `/home/git/repositories` or you can see where
+your repositories are located by looking at `config/gitlab.yml`:
 
 ```
-# omnibus-gitlab
-sudo gitlab-rake gitlab:import:repos
+# 3. Advanced settings
+# ==========================
+
+# GitLab Satellites
+# satellites:
+# Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
+# path: /home/git/gitlab-satellites/
+# timeout: 30
+
+satellites:
+  path: /home/git/gitlab-satellites/
+gitlab_shell:
+  path: /home/git/gitlab-shell/
+  repos_path: /home/git/repositories/
+  hooks_path: /home/git/gitlab-shell/hooks/
+  upload_pack: true
+  receive_pack: true
 
-# installation from source or cookbook
-bundle exec rake gitlab:import:repos RAILS_ENV=production
 ```
 
-Example output:
+2. Copy your bare repositories inside this newly created folder, e.g.:
+
+```
+$ cp /old/git/foo.git /home/git/repositories/new_group/foo.git
+```
+
+3. Run the command below depending on you type of installation:
+
+#### Omnibus Installation
+
+```
+$ sudo gitlab-rake gitlab:import:repos
+```
+
+#### Manual Installation
+
+```
+$ cd /home/git/gitlab
+$ sudo -u git -H bundle exec rake gitlab:import:repos RAILS_ENV=production
+```
+
+#### Example output:
 
 ```
 Processing abcd.git