Skip to content
This repository has been archived by the owner on Jul 11, 2020. It is now read-only.

Commit

Permalink
cleanup unicorn/delayed_job
Browse files Browse the repository at this point in the history
dwradcliffe committed Jun 18, 2014
1 parent fe0eed2 commit c05d697
Showing 6 changed files with 33 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Berksfile.lock
Original file line number Diff line number Diff line change
@@ -162,7 +162,7 @@ GRAPH
rubygems-sensu (>= 0.0.0)
rubygems-ssh (>= 0.0.0)
rubygems-utility (>= 0.0.0)
rubygems-app (0.0.13)
rubygems-app (0.0.14)
apt (>= 0.0.0)
chef-vault (>= 0.0.0)
git (>= 0.0.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-app/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name 'rubygems-app'

version '0.0.13'
version '0.0.14'

depends 'apt'
depends 'chef-vault'
16 changes: 15 additions & 1 deletion cookbooks/rubygems-app/recipes/delayed_job.rb
Original file line number Diff line number Diff line change
@@ -3,7 +3,21 @@
# Recipe:: delayed_job
#

redis_ip = search(:node, "name:redis01.#{node.chef_environment}.rubygems.org")[0]['ipaddress']

runit_service 'delayed_job' do
env node['environment_variables']
owner 'deploy'
group 'deploy'
default_logger true
env(
'RAILS_ENV' => node.chef_environment,
'REDISTOGO_URL' => "redis://#{redis_ip}:6379/0"
)
options(
owner: 'deploy',
group: 'deploy',
bundle_command: '/usr/local/bin/bundle',
rails_env: node.chef_environment,
)
action ::File.exist?('/applications/rubygems/current') ? :enable : :disable
end
8 changes: 5 additions & 3 deletions cookbooks/rubygems-app/recipes/unicorn.rb
Original file line number Diff line number Diff line change
@@ -15,12 +15,14 @@
runit_service 'unicorn' do
owner 'deploy'
group 'deploy'
default_logger true
env(
'RAILS_ENV' => node.chef_environment,
'REDISTOGO_URL' => "redis://#{redis_ip}:6379/0"
)
options(
name: 'rubygems',
owner: 'deploy',
group: 'deploy',
redis_url: "redis://#{redis_ip}:6379/0",
bundler: true,
bundle_command: '/usr/local/bin/bundle',
rails_env: node.chef_environment,
smells_like_rack: ::File.exist?('/applications/rubygems/current/config.ru')
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

cd /applications/rubygems/current

exec 2>&1
exec <%= node[:runit][:chpst_bin] %> \
-u <%= @options[:owner] %>:<%= @options[:group] %> \
<%= @options[:bundle_command] %> exec \
rake jobs:work
6 changes: 2 additions & 4 deletions cookbooks/rubygems-app/templates/default/sv-unicorn-run.erb
Original file line number Diff line number Diff line change
@@ -2,12 +2,10 @@

cd /applications/rubygems/current

export REDISTOGO_URL="<%= @options[:redis_url] %>"

exec 2>&1
exec <%= node[:runit][:chpst_bin] %> \
-u <%= @options[:owner] %>:<%= @options[:group] %> \
<%= @options[:bundler] ? "#{@options[:bundle_command]} exec" : '' %> \
<%= @options[:bundle_command] %> exec \
<%= @options[:smells_like_rack] ? 'unicorn' : 'unicorn_rails' %> \
-E <%= @options[:rails_env] %> \
-c /etc/unicorn/<%= @options[:name] %>.rb
-c /etc/unicorn/rubygems.rb

0 comments on commit c05d697

Please sign in to comment.