summaryrefslogtreecommitdiff
path: root/doc/raketasks
diff options
context:
space:
mode:
Diffstat (limited to 'doc/raketasks')
-rw-r--r--doc/raketasks/backup_restore.md8
-rw-r--r--doc/raketasks/import.md47
2 files changed, 36 insertions, 19 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 9318f0390f8..b4581e2a07a 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -48,10 +48,10 @@ Deleting old backups... [SKIPPING]
## Upload backups to remote (cloud) storage
-Starting with GitLab 7.4 you can let the backup script upload the '.tar' file
-it creates to cloud storage using [Fog](http://fog.io/storage/). In the example
-below we use Amazon S3 for storage, but Fog also lets you use other storage
-backends; see http://fog.io/storage/ .
+Starting with GitLab 7.4 you can let the backup script upload the '.tar' file it creates.
+It uses the [Fog library](http://fog.io/) to perform the upload.
+In the example below we use Amazon S3 for storage.
+But Fog also lets you use [other storage providers](http://fog.io/storage/).
For omnibus packages:
diff --git a/doc/raketasks/import.md b/doc/raketasks/import.md
index 39b1a52a44d..bb229e8acbb 100644
--- a/doc/raketasks/import.md
+++ b/doc/raketasks/import.md
@@ -1,28 +1,45 @@
-# Import
+# Import bare repositories into your GitLab instance
-### Import bare repositories into GitLab project instance
+## Notes
-Notes:
+- The owner of the project will be the first admin
+- The groups will be created as needed
+- The owner of the group will be the first admin
+- Existing projects will be skipped
-* project owner will be a first admin
-* groups will be created as needed
-* group owner will be the first admin
-* existing projects will be skipped
+## How to use
-How to use:
+### Create a new folder inside the git repositories path. This will be the name of the new group.
-1. copy your bare repos under git repos_path (see `config/gitlab.yml` gitlab_shell -> repos_path)
-2. run the command below
+- For omnibus-gitlab, it is located at: `/var/opt/gitlab/git-data/repositories` by default, unless you changed
+it in the `/etc/gitlab/gitlab.rb` file.
+- 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` under the `gitlab_shell => repos_path` entry.
+### Copy your bare repositories inside this newly created folder:
+
+```
+$ cp -r /old/git/foo.git/ /home/git/repositories/new_group/
+```
+
+### Run the command below depending on your type of installation:
+
+#### Omnibus Installation
+
+```
+$ sudo gitlab-rake gitlab:import:repos
```
-# omnibus-gitlab
-sudo gitlab-rake gitlab:import:repos
-# installation from source or cookbook
-bundle exec rake gitlab:import:repos RAILS_ENV=production
+#### Manual Installation
+
+Before running this command you need to change the directory to where your GitLab installation is located:
+
+```
+$ cd /home/git/gitlab
+$ sudo -u git -H bundle exec rake gitlab:import:repos RAILS_ENV=production
```
-Example output:
+#### Example output
```
Processing abcd.git