deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improving installation docs

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-05 13:02:58 +02:00
parent 70e3bffd95
commit 867945d193
3 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/gitlab.yml.example
View file

@ -96,7 +96,7 @@ omniauth:
# GitLab Satellites
satellites:
# Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
path: /home/gitlab/gitlab-satellites/
path: /home/git/gitlab-satellites/
## Backup settings
backup:
@ -105,8 +105,6 @@ backup:
## Gitolite settings
gitolite:
admin_uri: git@localhost:gitolite-admin
# REPOS_PATH MUST NOT BE A SYMLINK!!!
repos_path: /home/git/repositories/
hooks_path: /home/git/.gitolite/hooks/

2
config/unicorn.rb.example
View file

@ -2,7 +2,7 @@
# note that config/gitlab.yml web path should also be changed
# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
app_dir = "/home/gitlab/gitlab/"
app_dir = "/home/git/gitlab/"
worker_processes 2
working_directory app_dir

27
doc/install/installation.md
View file

@ -111,12 +111,6 @@ Create a `git` user for Gitlab:
./bin/install
## Add domains to list to the list of known hosts
sudo -u git -H ssh git@localhost
sudo -u git -H ssh git@YOUR_DOMAIN_NAME
sudo -u git -H ssh git@YOUR_GITOLITE_DOMAIN_NAME
# 5. Database
@ -137,10 +131,10 @@ See `doc/install/databases.md`
cd /home/git/gitlab
# Checkout to stable release
sudo -u git -H git checkout 4-1-stable
sudo -u git -H git checkout 5-0-stable
**Note:**
You can change `4-1-stable` to `master` if you want the *bleeding edge* version, but
You can change `5-0-stable` to `master` if you want the *bleeding edge* version, but
do so with caution!
## Configure it
@ -155,8 +149,8 @@ do so with caution!
sudo -u git -H vim config/gitlab.yml
# Make sure GitLab can write to the log/ and tmp/ directories
sudo chown -R gitlab log/
sudo chown -R gitlab tmp/
sudo chown -R git log/
sudo chown -R git tmp/
sudo chmod -R u+rwX log/
sudo chmod -R u+rwX tmp/
@ -191,19 +185,6 @@ Make sure to update username/password in config/database.yml.
# Or for PostgreSQL
sudo -u git -H bundle install --deployment --without development test mysql
## Configure Git
GitLab needs to be able to commit and push changes to Gitolite. In order to do
that Git requires a username and email. (We recommend using the same address
used for the `email.from` setting in `config/gitlab.yml`)
sudo -u git -H git config --global user.name "GitLab"
sudo -u git -H git config --global user.email "gitlab@localhost"
## Setup GitLab Hooks
sudo cp ./lib/hooks/post-receive /home/git/.gitolite/hooks/common/post-receive
sudo chown git:git /home/git/.gitolite/hooks/common/post-receive
## Initialise Database and Activate Advanced Features