Commit 2bc43c44 authored by Mohammad Alhashash's avatar Mohammad Alhashash Committed by root

Fix incorrect web server parameter in init.d script

Environment variable USE_WEB_SERVER should have the value of the selected webserver when calling bin/web startup script.

Fixes #65008
parent 76d793dc
...@@ -67,6 +67,13 @@ if ! cd "$app_root" ; then ...@@ -67,6 +67,13 @@ if ! cd "$app_root" ; then
echo "Failed to cd into $app_root, exiting!"; exit 1 echo "Failed to cd into $app_root, exiting!"; exit 1
fi fi
# Select the web server to use
if [ -z "$EXPERIMENTAL_PUMA" ]; then
use_web_server="unicorn"
else
use_web_server="puma"
fi
### Init Script functions ### Init Script functions
...@@ -256,7 +263,7 @@ start_gitlab() { ...@@ -256,7 +263,7 @@ start_gitlab() {
check_stale_pids check_stale_pids
if [ "$web_status" != "0" ]; then if [ "$web_status" != "0" ]; then
echo "Starting GitLab web server" echo "Starting GitLab web server ($use_web_server)"
fi fi
if [ "$sidekiq_status" != "0" ]; then if [ "$sidekiq_status" != "0" ]; then
echo "Starting GitLab Sidekiq" echo "Starting GitLab Sidekiq"
...@@ -281,7 +288,7 @@ start_gitlab() { ...@@ -281,7 +288,7 @@ start_gitlab() {
# Remove old socket if it exists # Remove old socket if it exists
rm -f "$rails_socket" 2>/dev/null rm -f "$rails_socket" 2>/dev/null
# Start the web server # Start the web server
RAILS_ENV=$RAILS_ENV EXPERIMENTAL_PUMA=$EXPERIMENTAL_PUMA bin/web start RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web start
fi fi
# If sidekiq is already running, don't start it again. # If sidekiq is already running, don't start it again.
...@@ -343,7 +350,7 @@ stop_gitlab() { ...@@ -343,7 +350,7 @@ stop_gitlab() {
if [ "$web_status" = "0" ]; then if [ "$web_status" = "0" ]; then
echo "Shutting down GitLab web server" echo "Shutting down GitLab web server"
RAILS_ENV=$RAILS_ENV EXPERIMENTAL_PUMA=$EXPERIMENTAL_PUMA bin/web stop RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web stop
fi fi
if [ "$sidekiq_status" = "0" ]; then if [ "$sidekiq_status" = "0" ]; then
echo "Shutting down GitLab Sidekiq" echo "Shutting down GitLab Sidekiq"
...@@ -447,7 +454,7 @@ reload_gitlab(){ ...@@ -447,7 +454,7 @@ reload_gitlab(){
exit 1 exit 1
fi fi
printf "Reloading GitLab web server configuration... " printf "Reloading GitLab web server configuration... "
RAILS_ENV=$RAILS_ENV EXPERIMENTAL_PUMA=$EXPERIMENTAL_PUMA bin/web reload RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web reload
echo "Done." echo "Done."
echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..." echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..."
......
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