diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-07 13:47:25 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-07 13:47:25 +0000 |
| commit | 99fceff4f9e98cc7cb725882abec6e5b7c9b0170 (patch) | |
| tree | 15e72f153acc1ce28457177b1e02a8c2c989c17b | |
| parent | fbef5676270b7b7e51d354ea7ca466a89d23afa4 (diff) | |
| parent | 41d431d97fcd254f06f270b8f7a792209d2167e6 (diff) | |
| download | gitlab-ce-99fceff4f9e98cc7cb725882abec6e5b7c9b0170.tar.gz | |
Merge branch '27785-fix-init-script-after-pages-to-ce' into 'master'
Fix syntax error in init.d/gitlab after Pages -> CE
Closes #27785
See merge request !9026
| -rwxr-xr-x | lib/support/init.d/gitlab | 2 |
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 |