Download as
Browse Code »

Commit a53f687fe6876c4db8c790f933dfac9e0c3fafa4

Authored by Axilleas Pipinellis
1 parent b65e5b1e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Added creation of pids directory to fix #2995, replaced deprecated nginx init.d … 

…command with service one, some more clean-up
Showing 1 changed file with 12 additions and 8 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @a53f687
@@ -94,16 +94,16 @@ Create a `git` user for Gitlab: @@ -94,16 +94,16 @@ Create a `git` user for Gitlab:
94 94
95 # 4. GitLab shell 95 # 4. GitLab shell
96 96
97 - # login as git 97 + # Login as git
98 sudo su git 98 sudo su git
99 99
100 - # go to home directory 100 + # Go to home directory
101 cd /home/git 101 cd /home/git
102 102
103 - # clone gitlab shell 103 + # Clone gitlab shell
104 git clone https://github.com/gitlabhq/gitlab-shell.git 104 git clone https://github.com/gitlabhq/gitlab-shell.git
105 105
106 - # setup 106 + # Setup
107 cd gitlab-shell 107 cd gitlab-shell
108 cp config.yml.example config.yml 108 cp config.yml.example config.yml
109 ./bin/install 109 ./bin/install
@@ -151,9 +151,13 @@ do so with caution! @@ -151,9 +151,13 @@ do so with caution!
151 sudo chmod -R u+rwX log/ 151 sudo chmod -R u+rwX log/
152 sudo chmod -R u+rwX tmp/ 152 sudo chmod -R u+rwX tmp/
153 153
154 - # Make directory for satellites 154 + # Create directory for satellites
155 sudo -u git -H mkdir /home/git/gitlab-satellites 155 sudo -u git -H mkdir /home/git/gitlab-satellites
156 156
  157 + # Create directory for pids and make sure GitLab can write to it
  158 + sudo -u git -H mkdir tmp/pids/
  159 + sudo chmod -R u+rwX tmp/pids/
  160 +
157 # Copy the example Unicorn config 161 # Copy the example Unicorn config
158 sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb 162 sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb
159 163
@@ -204,7 +208,7 @@ Make GitLab start on boot: @@ -204,7 +208,7 @@ Make GitLab start on boot:
204 208
205 ## Check Application Status 209 ## Check Application Status
206 210
207 -Check if GitLab and its environment is configured correctly: 211 +Check if GitLab and its environment are configured correctly:
208 212
209 sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production 213 sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
210 214
@@ -247,7 +251,7 @@ Make sure to edit the config file to match your setup: @@ -247,7 +251,7 @@ Make sure to edit the config file to match your setup:
247 251
248 ## Restart 252 ## Restart
249 253
250 - sudo /etc/init.d/nginx restart 254 + sudo service nginx restart
251 255
252 256
253 # Done! 257 # Done!
@@ -281,7 +285,7 @@ a different host, you can configure its connection string via the @@ -281,7 +285,7 @@ a different host, you can configure its connection string via the
281 285
282 ## Custom SSH Connection 286 ## Custom SSH Connection
283 287
284 -If you are running SSH on a non-standard port, you must change the gitlab user'S SSH config. 288 +If you are running SSH on a non-standard port, you must change the gitlab user's SSH config.
285 289
286 # Add to /home/git/.ssh/config 290 # Add to /home/git/.ssh/config
287 host localhost # Give your setup a name (here: override localhost) 291 host localhost # Give your setup a name (here: override localhost)