diff --git a/config/puma.rb.example b/config/puma.rb.example index b1562215c1df2534905f8bd63f7412680f80bd39..ad5e3e235010c9a8d7080dd83ea7aa1d1c7d8ad0 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -1,7 +1,7 @@ #!/usr/bin/env puma # 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 # note that config/gitlab.yml web path should also be changed @@ -19,7 +19,7 @@ directory application_path # # The default is “developmentâ€. # -environment = :production +environment 'production' # Daemonize the server into the background. Highly suggest that # this be combined with “pidfile†and “stdout_redirectâ€. diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 9c922f85b6aae13bb79f52e4cd86720505cf722a..47996594e3b53c193f682cca902ee88c7695b447 100644 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -17,7 +17,7 @@ APP_ROOT="/home/git/gitlab" 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" WEB_SERVER_PID="$PID_PATH/puma.pid" SIDEKIQ_PID="$PID_PATH/sidekiq.pid"