Commit 4635ad83e64865b30a34f5925c7c43e26b185112

Authored by Dmitriy Zaporozhets
2 parents 5a80a28a 50620b7d

Merge pull request #3126 from dosire/refer-to-vagrant-vm

Refer to virtual machine from the installation document.
Showing 1 changed file with 11 additions and 12 deletions   Show diff stats
doc/install/installation.md
1   -This installation guide was created for Debian/Ubuntu and tested on it.
2   -
3   -Please read [`doc/install/requirements.md`](./requirements.md) for hardware and platform requirements.
  1 +This installation guide was created for Debian/Ubuntu and tested on it. Please read [`doc/install/requirements.md`](./requirements.md) for hardware and platform requirements.
4 2  
  3 +This installation guide is recommended to set up a production server. If you want a development environment please use the [Vargrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm) since it makes it much easier to set up all the dependencies for integration testing.
5 4  
6 5 **Important Note:**
7 6 The following steps have been known to work.
... ... @@ -97,10 +96,10 @@ Create a `git` user for Gitlab:
97 96  
98 97 GitLab Shell is a ssh access and repository management software developed specially for GitLab.
99 98  
100   - # Login as git
  99 + # Login as git
101 100 sudo su git
102 101  
103   - # Go to home directory
  102 + # Go to home directory
104 103 cd /home/git
105 104  
106 105 # Clone gitlab shell
... ... @@ -109,12 +108,12 @@ GitLab Shell is a ssh access and repository management software developed specia
109 108 cd gitlab-shell
110 109 cp config.yml.example config.yml
111 110  
112   - # Edit config and replace gitlab_url
  111 + # Edit config and replace gitlab_url
113 112 # with something like 'http://domain.com/'
114 113 vim config.yml
115 114  
116 115 # Do setup
117   - ./bin/install
  116 + ./bin/install
118 117  
119 118  
120 119 # 5. Database
... ... @@ -132,9 +131,9 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
132 131 # Clone GitLab repository
133 132 sudo -u git -H git clone https://github.com/gitlabhq/gitlabhq.git gitlab
134 133  
135   - # Go to gitlab dir
  134 + # Go to gitlab dir
136 135 cd /home/git/gitlab
137   -
  136 +
138 137 # Checkout to stable release
139 138 sudo -u git -H git checkout 5-0-stable
140 139  
... ... @@ -165,7 +164,7 @@ do so with caution!
165 164 # Create directory for pids and make sure GitLab can write to it
166 165 sudo -u git -H mkdir tmp/pids/
167 166 sudo chmod -R u+rwX tmp/pids/
168   -
  167 +
169 168 # Copy the example Unicorn config
170 169 sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb
171 170  
... ... @@ -196,7 +195,7 @@ Make sure to update username/password in config/database.yml.
196 195  
197 196  
198 197 ## Initialise Database and Activate Advanced Features
199   -
  198 +
200 199 sudo -u git -H bundle exec rake db:setup RAILS_ENV=production
201 200 sudo -u git -H bundle exec rake db:seed_fu RAILS_ENV=production
202 201 sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production
... ... @@ -294,7 +293,7 @@ a different host, you can configure its connection string via the
294 293 ## Custom SSH Connection
295 294  
296 295 If you are running SSH on a non-standard port, you must change the gitlab user's SSH config.
297   -
  296 +
298 297 # Add to /home/git/.ssh/config
299 298 host localhost # Give your setup a name (here: override localhost)
300 299 user git # Your remote git user
... ...