Commit dbf8ae73 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents 74b72003 31cdb7a4
...@@ -151,7 +151,7 @@ or start each component separately ...@@ -151,7 +151,7 @@ or start each component separately
* [#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. * [#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.
* [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthousiast Jonathan M. Hethey is unofficial but it offers a good overview. * [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthusiast Jonathan M. Hethey is unofficial but it offers a good overview.
### Getting in touch ### Getting in touch
......
...@@ -31,6 +31,8 @@ sidekiq_pid_path="$pid_path/sidekiq.pid" ...@@ -31,6 +31,8 @@ sidekiq_pid_path="$pid_path/sidekiq.pid"
### Here ends user configuration ### ### Here ends user configuration ###
# Read configuration variable file if it is present
test -f /etc/default/gitlab && . /etc/default/gitlab
# Switch to the app_user if it is not he/she who is running the script. # Switch to the app_user if it is not he/she who is running the script.
if [ "$USER" != "$app_user" ]; then if [ "$USER" != "$app_user" ]; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment