Commit 239b3f86 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'fix-default-script' into 'master'

Set the puma.pid to default settings

See merge request gitlab-org/gitlab!32312
parents 4f298281 fc40f307
...@@ -26,8 +26,8 @@ pid_path="$app_root/tmp/pids" ...@@ -26,8 +26,8 @@ pid_path="$app_root/tmp/pids"
socket_path="$app_root/tmp/sockets" socket_path="$app_root/tmp/sockets"
# web_server_pid_path defines the path in which to create the pid file fo the web_server # web_server_pid_path defines the path in which to create the pid file fo the web_server
# The default is "$pid_path/unicorn.pid" # The default is "$pid_path/puma.pid"
web_server_pid_path="$pid_path/unicorn.pid" web_server_pid_path="$pid_path/puma.pid"
# sidekiq_pid_path defines the path in which to create the pid file for sidekiq # sidekiq_pid_path defines the path in which to create the pid file for sidekiq
# The default is "$pid_path/sidekiq.pid" # The default is "$pid_path/sidekiq.pid"
......
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