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

Commit

Permalink
fix database credentials
Browse files Browse the repository at this point in the history
dwradcliffe committed Jun 20, 2014
1 parent 1764a1b commit c90e69c
Showing 5 changed files with 12 additions and 7 deletions.
5 changes: 3 additions & 2 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -165,7 +165,7 @@ GRAPH
rubygems-sensu (>= 0.0.0)
rubygems-ssh (>= 0.0.0)
rubygems-utility (>= 0.0.0)
rubygems-app (0.0.15)
rubygems-app (0.0.16)
apt (>= 0.0.0)
chef-vault (>= 0.0.0)
git (>= 0.0.0)
@@ -188,7 +188,8 @@ GRAPH
rubygems (>= 0.0.0)
rubygems-chef (0.0.6)
chef-client (>= 0.0.0)
rubygems-database (0.0.21)
rubygems-database (0.0.22)
chef-vault (>= 0.0.0)
database (>= 0.0.0)
postgresql (>= 0.0.0)
rubygems (>= 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.15'
version '0.0.16'

depends 'apt'
depends 'chef-vault'
2 changes: 1 addition & 1 deletion cookbooks/rubygems-app/recipes/config.rb
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
variables(
rails_env: node.chef_environment,
adapter: 'postgresql',
database: "gemcutter_#{node.chef_environment}",
database: "rubygems_#{node.chef_environment}",
username: secrets['rails_postgresql_user'],
password: secrets['rails_postgresql_password'],
host: db_host
3 changes: 2 additions & 1 deletion cookbooks/rubygems-database/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name 'rubygems-database'
maintainer 'RubyGems.org ops team'

version '0.0.21'
version '0.0.22'

depends 'chef-vault'
depends 'database'
depends 'postgresql'
depends 'rubygems'
7 changes: 5 additions & 2 deletions cookbooks/rubygems-database/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -4,6 +4,9 @@
#

include_recipe 'rubygems'
include_recipe 'chef-vault'

secrets = chef_vault_item('rubygems', node.chef_environment)

node.default['postgresql']['config']['listen_addresses'] = '0.0.0.0'
node.default['postgresql']['config']['work_mem'] = '100MB'
@@ -13,8 +16,8 @@
{
'type' => 'host',
'db' => "rubygems_#{node.chef_environment}",
'user' => 'postgres',
'password' => 'postgres',
'user' => secrets['rails_postgresql_user'],
'password' => secrets['rails_postgresql_password'],
'addr' => "#{search(:node, "name:app01.#{node.chef_environment}.rubygems.org")[0]['ipaddress']}/0",
'method' => 'md5'
},

0 comments on commit c90e69c

Please sign in to comment.