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

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
dwradcliffe committed May 30, 2015
1 parent ad33e2e commit e9d69a0
Showing 6 changed files with 18 additions and 10 deletions.
10 changes: 7 additions & 3 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -234,7 +234,7 @@ GRAPH
rubygems-sensu (>= 0.0.0)
rubygems-ssh (>= 0.0.0)
rubygems-utility (>= 0.0.0)
rubygems-app (0.0.52)
rubygems-app (0.0.53)
apt (>= 0.0.0)
chef-vault (>= 0.0.0)
datadog (>= 0.0.0)
@@ -243,6 +243,7 @@ GRAPH
nodejs (>= 0.0.0)
postfix (= 3.2.0)
rubygems (>= 0.0.0)
rubygems-people (>= 0.0.0)
rubygems-ruby (>= 0.0.0)
runit (>= 0.0.0)
sudo (>= 0.0.0)
@@ -253,12 +254,13 @@ GRAPH
rubygems-backups (0.0.21)
chef-vault (>= 0.0.0)
rubygems-ruby (>= 0.0.0)
rubygems-balancer (0.0.57)
rubygems-balancer (0.0.58)
chef-vault (>= 0.0.0)
datadog (>= 0.0.0)
logrotate (>= 0.0.0)
nginx (>= 0.0.0)
rubygems (>= 0.0.0)
rubygems-people (>= 0.0.0)
rubygems-bastion (0.0.10)
chef-vault (>= 0.0.0)
duo-security (>= 0.0.0)
@@ -338,11 +340,13 @@ GRAPH
rubygems (>= 0.0.0)
sensu (= 2.1.0)
uchiwa (= 1.0.0)
rubygems-shipit (0.0.47)
rubygems-shipit (0.0.48)
apt (>= 0.0.0)
git (>= 0.0.0)
logrotate (>= 0.0.0)
nginx (>= 0.0.0)
nodejs (>= 0.0.0)
rubygems-people (>= 0.0.0)
runit (>= 0.0.0)
sudo (>= 0.0.0)
rubygems-ssh (0.0.5)
3 changes: 2 additions & 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.52'
version '0.0.53'

depends 'apt'
depends 'chef-vault'
@@ -10,6 +10,7 @@
depends 'nodejs'
depends 'postfix', '3.2.0'
depends 'rubygems'
depends 'rubygems-people'
depends 'rubygems-ruby'
depends 'runit'
depends 'sudo'
3 changes: 2 additions & 1 deletion cookbooks/rubygems-balancer/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name 'rubygems-balancer'

version '0.0.57'
version '0.0.58'

depends 'chef-vault'
depends 'datadog'
depends 'logrotate'
depends 'nginx'
depends 'rubygems'
depends 'rubygems-people'
4 changes: 3 additions & 1 deletion cookbooks/rubygems-shipit/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
name 'rubygems-shipit'

version '0.0.47'
version '0.0.48'

depends 'apt'
depends 'git'
depends 'logrotate'
depends 'nginx'
depends 'nodejs'
depends 'rubygems-people'
depends 'runit'
depends 'sudo'

2 changes: 1 addition & 1 deletion cookbooks/rubygems-shipit/recipes/app.rb
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
end

2.times do |n|
worker_name = "shipit-resque-#{n+1}"
worker_name = "shipit-resque-#{n + 1}"

runit_service worker_name do
run_template_name 'resque'
6 changes: 3 additions & 3 deletions cookbooks/rubygems-shipit/recipes/setup.rb
Original file line number Diff line number Diff line change
@@ -55,11 +55,11 @@
end

current_environment = 'production'
raw_yaml_files = %w{database}
raw_yaml_files = %w(database)
shared_config_path = "#{BASE_DIR}/shared/config"

raw_yaml_files.each do |name|
data = {current_environment => bag[name]}
data = { current_environment => bag[name] }
file "#{shared_config_path}/#{name}.yml" do
owner 'deploy'
group 'shipit'
@@ -93,7 +93,7 @@

logrotate_app 'shipit' do
options %w(missingok notifempty compress delaycompress)
path [ "#{LOG_DIR}/*.log" ]
path ["#{LOG_DIR}/*.log"]
frequency 'daily'
rotate 4
postrotate 'sv hup /etc/sv/shipit-thin-* && sv quit /etc/sv/shipit-resque-*'

0 comments on commit e9d69a0

Please sign in to comment.