Commit 85e784cc authored by Lyle Entwistle's avatar Lyle Entwistle

Fixed puma.rb environment setting, no need to specify 'production' in daemon options now

parent 6e1ee1fe
#!/usr/bin/env puma #!/usr/bin/env puma
# Start Puma with next command: # Start Puma with next command:
# RAILS_ENV=production bundle exec puma -e production -C ./config/puma.rb # RAILS_ENV=production bundle exec puma -C ./config/puma.rb
# uncomment and customize to run in non-root path # uncomment and customize to run in non-root path
# note that config/gitlab.yml web path should also be changed # note that config/gitlab.yml web path should also be changed
...@@ -19,7 +19,7 @@ directory application_path ...@@ -19,7 +19,7 @@ directory application_path
# #
# The default is “development”. # The default is “development”.
# #
environment = :production environment 'production'
# Daemonize the server into the background. Highly suggest that # Daemonize the server into the background. Highly suggest that
# this be combined with “pidfile” and “stdout_redirect”. # this be combined with “pidfile” and “stdout_redirect”.
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
APP_ROOT="/home/git/gitlab" APP_ROOT="/home/git/gitlab"
APP_USER="git" APP_USER="git"
DAEMON_OPTS="-C $APP_ROOT/config/puma.rb -e production" DAEMON_OPTS="-C $APP_ROOT/config/puma.rb"
PID_PATH="$APP_ROOT/tmp/pids" PID_PATH="$APP_ROOT/tmp/pids"
WEB_SERVER_PID="$PID_PATH/puma.pid" WEB_SERVER_PID="$PID_PATH/puma.pid"
SIDEKIQ_PID="$PID_PATH/sidekiq.pid" SIDEKIQ_PID="$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