summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew@blessing.io>2016-02-25 14:51:19 +0000
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-02-07 13:05:42 +0000
commit41d431d97fcd254f06f270b8f7a792209d2167e6 (patch)
tree6dc04d0929341da0364be41a85023b5f1f836dce
parent95a3e2da9b75ac30ff95f3bf6018d200204f6af6 (diff)
downloadgitlab-ce-41d431d97fcd254f06f270b8f7a792209d2167e6.tar.gz
Fix syntax error in init.d/gitlab after Pages -> CE
Cherry-picked ‘Fix syntax error in conditional statement’
-rwxr-xr-xlib/support/init.d/gitlab2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index 97414ead3dd..5fd7f0f98bd 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -107,7 +107,7 @@ check_pids(){
wait_for_pids(){
# We are sleeping a bit here mostly because sidekiq is slow at writing its pid
i=0;
- while [ ! -f $web_server_pid_path ] || [ ! -f $sidekiq_pid_path ] || [ ! -f $gitlab_workhorse_pid_path ] || { [ "$mail_room_enabled" = true ] && [ ! -f $mail_room_pid_path ] || { [ "$gitlab_pages_enabled" = true ] && [ ! -f $gitlab_pages_pid_path ]; }; do
+ while [ ! -f $web_server_pid_path ] || [ ! -f $sidekiq_pid_path ] || [ ! -f $gitlab_workhorse_pid_path ] || { [ "$mail_room_enabled" = true ] && [ ! -f $mail_room_pid_path ]; } || { [ "$gitlab_pages_enabled" = true ] && [ ! -f $gitlab_pages_pid_path ]; }; do
sleep 0.1;
i=$((i+1))
if [ $((i%10)) = 0 ]; then