From 74cfab692fd9808c1ea6a6cc6f45c348deb4fd72 Mon Sep 17 00:00:00 2001 From: Tobias Pfeiffer Date: Sat, 15 Sep 2012 20:26:08 +0200 Subject: [PATCH 1/2] Renamed unicorn.rb.orig to unicorn.rb.example since this seems to be more in line with the common used naming in the config directory. Plus seeing *.orig files I think of the leftovers of git merges, which left me puzzled for quite some time. --- config/{unicorn.rb.orig => unicorn.rb.example} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config/{unicorn.rb.orig => unicorn.rb.example} (100%) diff --git a/config/unicorn.rb.orig b/config/unicorn.rb.example similarity index 100% rename from config/unicorn.rb.orig rename to config/unicorn.rb.example From fa529c789c6d5e6c7c52de73166007e4650a46fa Mon Sep 17 00:00:00 2001 From: Tobias Pfeiffer Date: Sat, 15 Sep 2012 21:23:41 +0200 Subject: [PATCH 2/2] added the name change to the installation.md - thanks and nice catch to @NARKOZ --- doc/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/installation.md b/doc/installation.md index af169d81..d5d1ccdd 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -252,7 +252,7 @@ You can login via web using admin generated with setup: ## 1. Unicorn cd /home/gitlab/gitlab - sudo -u gitlab cp config/unicorn.rb.orig config/unicorn.rb + sudo -u gitlab cp config/unicorn.rb.example config/unicorn.rb sudo -u gitlab bundle exec unicorn_rails -c config/unicorn.rb -E production -D ## 2. Nginx