Commit 42032956bd4d51bd954762a6f1192f20d6375885
1 parent
d59d2a19
Exists in
master
and in
4 other branches
Cleaner install section for nginx, unicorn
Showing
1 changed file
with
9 additions
and
10 deletions
Show diff stats
doc/installation.md
| @@ -246,18 +246,18 @@ You can login via web using admin generated with setup: | @@ -246,18 +246,18 @@ You can login via web using admin generated with setup: | ||
| 246 | 246 | ||
| 247 | # Nginx && Unicorn | 247 | # Nginx && Unicorn |
| 248 | 248 | ||
| 249 | -### Install Nginx | ||
| 250 | - | ||
| 251 | - sudo apt-get install nginx | ||
| 252 | - | ||
| 253 | -## Unicorn | 249 | +## 1. Unicorn |
| 254 | 250 | ||
| 255 | cd /home/gitlab/gitlab | 251 | cd /home/gitlab/gitlab |
| 256 | sudo -u gitlab cp config/unicorn.rb.orig config/unicorn.rb | 252 | sudo -u gitlab cp config/unicorn.rb.orig config/unicorn.rb |
| 257 | sudo -u gitlab bundle exec unicorn_rails -c config/unicorn.rb -E production -D | 253 | sudo -u gitlab bundle exec unicorn_rails -c config/unicorn.rb -E production -D |
| 258 | 254 | ||
| 259 | -Add GitLab to nginx sites & change with your host specific settings | 255 | +## 2. Nginx |
| 256 | + | ||
| 257 | + # Install first | ||
| 258 | + sudo apt-get install nginx | ||
| 260 | 259 | ||
| 260 | + # Add GitLab to nginx sites & change with your host specific settings | ||
| 261 | sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab -P /etc/nginx/sites-available/ | 261 | sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab -P /etc/nginx/sites-available/ |
| 262 | sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab | 262 | sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab |
| 263 | 263 | ||
| @@ -266,16 +266,15 @@ Add GitLab to nginx sites & change with your host specific settings | @@ -266,16 +266,15 @@ Add GitLab to nginx sites & change with your host specific settings | ||
| 266 | # of the host serving GitLab. | 266 | # of the host serving GitLab. |
| 267 | sudo vim /etc/nginx/sites-enabled/gitlab | 267 | sudo vim /etc/nginx/sites-enabled/gitlab |
| 268 | 268 | ||
| 269 | -Restart nginx: | ||
| 270 | 269 | ||
| 270 | + # Restart nginx: | ||
| 271 | /etc/init.d/nginx restart | 271 | /etc/init.d/nginx restart |
| 272 | 272 | ||
| 273 | +## 3. Init script | ||
| 274 | + | ||
| 273 | Create init script in /etc/init.d/gitlab: | 275 | Create init script in /etc/init.d/gitlab: |
| 274 | 276 | ||
| 275 | sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab -P /etc/init.d/ | 277 | sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab -P /etc/init.d/ |
| 276 | - | ||
| 277 | -Adding permission: | ||
| 278 | - | ||
| 279 | sudo chmod +x /etc/init.d/gitlab | 278 | sudo chmod +x /etc/init.d/gitlab |
| 280 | 279 | ||
| 281 | GitLab autostart: | 280 | GitLab autostart: |