Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Prepping for test deploy
  • Loading branch information
Robert May committed Jun 17, 2013
1 parent 2ad3779 commit 3f40c4f
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 5 deletions.
3 changes: 3 additions & 0 deletions Capfile
@@ -0,0 +1,3 @@
load 'deploy'
load 'deploy/assets'
load 'config/deploy' # remove this line to skip loading any of the default tasks
4 changes: 4 additions & 0 deletions Gemfile
Expand Up @@ -6,6 +6,10 @@ ruby "2.0.0"
gem 'rails', '4.0.0.rc1'
gem 'sinatra', '>= 1.3.0', require: nil

# deployment
gem 'capistrano'
gem 'capistrano-foreman'

# utilities
gem 'thread'
gem 'httparty'
Expand Down
12 changes: 12 additions & 0 deletions Gemfile.lock
Expand Up @@ -97,6 +97,12 @@ GEM
mocha (~> 0.13.2)
builder (3.1.4)
cancan (1.6.9)
capistrano (2.15.4)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
celluloid (0.14.1)
timers (>= 1.0.0)
childprocess (0.3.9)
Expand Down Expand Up @@ -167,6 +173,7 @@ GEM
guard (>= 1.1)
spork (>= 0.8.4)
hashie (2.0.5)
highline (1.6.19)
hike (1.2.2)
http_parser.rb (0.5.3)
httparty (0.11.0)
Expand Down Expand Up @@ -225,7 +232,11 @@ GEM
multipart-post (1.2.0)
net-scp (1.1.0)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.7)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
newrelic_rpm (3.6.1.88)
nokogiri (1.5.9)
oauth2 (0.8.1)
Expand Down Expand Up @@ -427,6 +438,7 @@ PLATFORMS
DEPENDENCIES
airbrake
cancan
capistrano
closure_tree!
coffee-rails (~> 4.0.0.beta1)
dalli
Expand Down
2 changes: 1 addition & 1 deletion Procfile
@@ -1,2 +1,2 @@
web: bundle exec puma -p $PORT -t 8:8
web: bundle exec puma -C ./config/puma.rb
worker: bundle exec sidekiq -q events,3 -q mailer,3 -q sunspot,2 -q photos,2 -q default,1 -q low -c 25
10 changes: 6 additions & 4 deletions config/puma.rb
@@ -1,6 +1,8 @@
environment $RAILS_ENV
threads 8, 16
threads 16, 16
daemonize true
pidfile "/tmp/web_server.pid"
bind "unix:///tmp/web_server.sock"
stdout_redirect "#{ENV['RAILS_STACK_PATH']}/log/puma.stdout.log", "#{ENV['RAILS_STACK_PATH']}/log/puma.stderr.log"
pidfile "/var/run/web_server.pid"
bind "unix:///var/run/web_server.sock"

# Add a worker per CPU core
workers %x{grep -c processor /proc/cpuinfo}.strip

0 comments on commit 3f40c4f

Please sign in to comment.