From c68742ed560b0bbf84c9fe6f6707cf47e9ed792c Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 21 Jan 2015 15:14:46 +0100 Subject: [PATCH 1/2] Make omnibus the default in repo import docs --- doc/raketasks/import.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/raketasks/import.md b/doc/raketasks/import.md index 32fe4dc8d0a..dbce6aae895 100644 --- a/doc/raketasks/import.md +++ b/doc/raketasks/import.md @@ -19,15 +19,20 @@ your repositories are located by looking at `config/gitlab.yml` under the `gitla New folder needs to have git user ownership and read/write/execute access for git user and its group: ``` -$ mkdir new_group -$ chown git:git new_group -$ chmod 770 new_group +# Replace /var/opt/gitlab/git-data with /home/git if you are using an +# installation from source. +sudo -u git mkdir /var/opt/gitlab/git-data/repositories/new_group ``` ### Copy your bare repositories inside this newly created folder: ``` -$ cp -r /old/git/foo.git/ /home/git/repositories/new_group/ +# Replace /var/opt/gitlab/git-data with /home/git if you are using an +# installation from source. +sudo cp -r /old/git/foo.git /var/opt/gitlab/git-data/repositories/new_group/ + +# Do this once when you are done copying git repositories +sudo chown -R git:git /var/opt/gitlab/git-data/repositories/new_group/ ``` `foo.git` needs to be owned by the git user and git users group. From addb2555841510bb48bc0fb9f1a90d80a7ed87fe Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 26 Jan 2015 17:03:04 +0100 Subject: [PATCH 2/2] Separate out the instructions for source installs --- doc/raketasks/import.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/raketasks/import.md b/doc/raketasks/import.md index dbce6aae895..9a10c8d6850 100644 --- a/doc/raketasks/import.md +++ b/doc/raketasks/import.md @@ -19,16 +19,15 @@ your repositories are located by looking at `config/gitlab.yml` under the `gitla New folder needs to have git user ownership and read/write/execute access for git user and its group: ``` -# Replace /var/opt/gitlab/git-data with /home/git if you are using an -# installation from source. sudo -u git mkdir /var/opt/gitlab/git-data/repositories/new_group ``` +If you are using an installation from source, replace `/var/opt/gitlab/git-data` +with `/home/git`. + ### Copy your bare repositories inside this newly created folder: ``` -# Replace /var/opt/gitlab/git-data with /home/git if you are using an -# installation from source. sudo cp -r /old/git/foo.git /var/opt/gitlab/git-data/repositories/new_group/ # Do this once when you are done copying git repositories @@ -37,6 +36,9 @@ sudo chown -R git:git /var/opt/gitlab/git-data/repositories/new_group/ `foo.git` needs to be owned by the git user and git users group. +If you are using an installation from source, replace `/var/opt/gitlab/git-data` +with `/home/git`. + ### Run the command below depending on your type of installation: #### Omnibus Installation