Download as
Browse Code »

Commit dbf8ae7301b50d1652ce1ccbf974e8b8ac88ffd3

Authored by Dmitriy Zaporozhets
2 parents 74b72003 31cdb7a4
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Showing 2 changed files with 3 additions and 1 deletions   Show diff stats
README.md
  Diff comments   View file @dbf8ae7
... ... @@ -151,7 +151,7 @@ or start each component separately
151 151  
152 152 * [#gitlab IRC channel](http://www.freenode.net/) on Freenode is unofficial but offers a way to get in touch with other GitLab users who may be able to help you.
153 153  
154   -* [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthousiast Jonathan M. Hethey is unofficial but it offers a good overview.
  154 +* [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthusiast Jonathan M. Hethey is unofficial but it offers a good overview.
155 155  
156 156  
157 157 ### Getting in touch
... ...
lib/support/init.d/gitlab
  Diff comments   View file @dbf8ae7
... ... @@ -31,6 +31,8 @@ sidekiq_pid_path="$pid_path/sidekiq.pid"
31 31  
32 32 ### Here ends user configuration ###
33 33  
  34 +# Read configuration variable file if it is present
  35 +test -f /etc/default/gitlab && . /etc/default/gitlab
34 36  
35 37 # Switch to the app_user if it is not he/she who is running the script.
36 38 if [ "$USER" != "$app_user" ]; then
... ...