Permalink
Browse files

Removed all puma references

  • Loading branch information...
1 parent b2abce9 commit f90c8269ac8cb3fe32c1b6a33536f2a97a3463d6 @jvanbaarsen jvanbaarsen committed Feb 18, 2014
Showing with 3 additions and 118 deletions.
  1. +0 −1 Gemfile
  2. +1 −1 Procfile
  3. +0 −114 config/puma.rb.example
  4. +2 −2 doc/install/installation.md
View
@@ -23,7 +23,6 @@ gem 'pg', group: :postgres
gem 'settingslogic'
# Web server
-# gem "puma", "~> 2.7.1"
gem "unicorn", "~> 4.8.2"
# Haml
View
@@ -1,2 +1,2 @@
-web: bundle exec puma -p $PORT
+web: bundle exec unicorn_rails -p $PORT
worker: bundle exec sidekiq -q runner,default
View
@@ -1,114 +0,0 @@
-#!/usr/bin/env puma
-
-# Start Puma with next command:
-# RAILS_ENV=production bundle exec puma -e production -C ./config/puma.rb
-
-application_path = '/home/gitlab_ci/gitlab-ci'
-
-# The directory to operate out of.
-#
-# The default is the current directory.
-#
-directory application_path
-
-# Set the environment in which the rack's app will run.
-#
-# The default is “development”.
-#
-environment = :production
-
-# Daemonize the server into the background. Highly suggest that
-# this be combined with “pidfile” and “stdout_redirect”.
-#
-# The default is “false”.
-#
-daemonize true
-
-# Store the pid of the server in the file at “path”.
-#
-pidfile "#{application_path}/tmp/pids/puma.pid"
-
-# Use “path” as the file to store the server info state. This is
-# used by “pumactl” to query and control the server.
-#
-state_path "#{application_path}/tmp/pids/puma.state"
-
-# Redirect STDOUT and STDERR to files specified. The 3rd parameter
-# (“append”) specifies whether the output is appended, the default is
-# “false”.
-#
-stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-# stdout_redirect '/u/apps/lolcat/log/stdout', '/u/apps/lolcat/log/stderr', true
-
-# Disable request logging.
-#
-# The default is “false”.
-#
-# quiet
-
-# Configure “min” to be the minimum number of threads to use to answer
-# requests and “max” the maximum.
-#
-# The default is “0, 16”.
-#
-# threads 0, 16
-
-# Bind the server to “url”. “tcp://”, “unix://” and “ssl://” are the only
-# accepted protocols.
-#
-# The default is “tcp://0.0.0.0:9292”.
-#
-# bind 'tcp://0.0.0.0:9292'
-bind "unix://#{application_path}/tmp/sockets/gitlab-ci.socket"
-
-# Instead of “bind 'ssl://127.0.0.1:9292?key=path_to_key&cert=path_to_cert'” you
-# can also use the “ssl_bind” option.
-#
-# ssl_bind '127.0.0.1', '9292', { key: path_to_key, cert: path_to_cert }
-
-# Code to run before doing a restart. This code should
-# close log files, database connections, etc.
-#
-# This can be called multiple times to add code each time.
-#
-# on_restart do
-# puts 'On restart...'
-# end
-
-# Command to use to restart puma. This should be just how to
-# load puma itself (ie. 'ruby -Ilib bin/puma'), not the arguments
-# to puma, as those are the same as the original process.
-#
-# restart_command '/u/app/lolcat/bin/restart_puma'
-
-# === Cluster mode ===
-
-# How many worker processes to run.
-#
-# The default is “0”.
-#
-# workers 2
-
-# Code to run when a worker boots to setup the process before booting
-# the app.
-#
-# This can be called multiple times to add hooks.
-#
-# on_worker_boot do
-# puts 'On worker boot...'
-# end
-
-# === Puma control rack application ===
-
-# Start the puma control rack application on “url”. This application can
-# be communicated with to control the main server. Additionally, you can
-# provide an authentication token, so all requests to the control server
-# will need to include that token as a query parameter. This allows for
-# simple authentication.
-#
-# Check out https://github.com/puma/puma/blob/master/lib/puma/app/status.rb
-# to see what the app has available.
-#
-# activate_control_app 'unix:///var/run/pumactl.sock'
-# activate_control_app 'unix:///var/run/pumactl.sock', { auth_token: '12345' }
-# activate_control_app 'unix:///var/run/pumactl.sock', { no_token: true }
@@ -105,8 +105,8 @@ You can use either MySQL or PostgreSQL.
sudo -u gitlab_ci -H editor config/application.yml
# Edit web server settings
- sudo -u gitlab_ci -H cp config/puma.rb.example config/puma.rb
- sudo -u gitlab_ci -H editor config/puma.rb
+ sudo -u gitlab_ci -H cp config/unicorn.rb.example config/unicorn.rb
+ sudo -u gitlab_ci -H editor config/unicorn.rb
# Create socket and pid directories
sudo -u gitlab_ci -H mkdir -p tmp/sockets/

0 comments on commit f90c826

Please sign in to comment.