summaryrefslogtreecommitdiff
path: root/lib/support
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-22 12:26:22 +0200
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:55:30 +0000
commit5556db04040c8c97834728dcf0fb26d2ea2c9a16 (patch)
treec2c5423eac953a206073f6ff5c7d9ac64609ff9f /lib/support
parent8094a9d1115bfbe2899fd63862f0d3f9fcce438b (diff)
downloadgitlab-ce-5556db04040c8c97834728dcf0fb26d2ea2c9a16.tar.gz
Add missing gitlab-pages related vars in init.d/gitlab
Diffstat (limited to 'lib/support')
-rwxr-xr-xlib/support/init.d/gitlab4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index 9f2ce01d931..97414ead3dd 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 ]; }; 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
@@ -240,7 +240,7 @@ start_gitlab() {
if [ "$mail_room_enabled" = true ] && [ "$mail_room_status" != "0" ]; then
echo "Starting GitLab MailRoom"
fi
- if [ "gitlab_pages_enabled" = true ] && [ "$gitlab_pages_status" != "0" ]; then
+ if [ "$gitlab_pages_enabled" = true ] && [ "$gitlab_pages_status" != "0" ]; then
echo "Starting GitLab Pages"
fi