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

Commit

Permalink
try username/password auth for uchiwa
Browse files Browse the repository at this point in the history
dwradcliffe committed Mar 14, 2015
1 parent 96e7275 commit 9fb3937
Showing 5 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -253,7 +253,7 @@ GRAPH
rubygems-logging (0.0.6)
chef-vault (>= 0.0.0)
rsyslog (>= 0.0.0)
rubygems-monitoring (0.0.19)
rubygems-monitoring (0.0.20)
chef-vault (>= 0.0.0)
cpan (>= 0.0.0)
dnsimple (>= 0.0.0)
@@ -282,7 +282,7 @@ GRAPH
rubygems (>= 0.0.0)
rubygems-ruby (0.0.5)
apt (>= 0.0.0)
rubygems-sensu (0.1.28)
rubygems-sensu (0.1.29)
build-essential (>= 0.0.0)
chef-vault (>= 0.0.0)
sensu (= 2.1.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-monitoring/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name 'rubygems-monitoring'
maintainer 'RubyGems.org ops team'

version '0.0.19'
version '0.0.20'

depends 'chef-vault'
depends 'cpan'
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ server {
proxy_redirect off;

location / {
proxy_pass http://localhost:3001;
proxy_pass http://localhost:3000;
}

}
2 changes: 1 addition & 1 deletion cookbooks/rubygems-sensu/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name 'rubygems-sensu'
maintainer 'RubyGems.org ops team'

version '0.1.28'
version '0.1.29'

depends 'build-essential'
depends 'chef-vault'
8 changes: 6 additions & 2 deletions cookbooks/rubygems-sensu/recipes/uchiwa.rb
Original file line number Diff line number Diff line change
@@ -3,9 +3,13 @@
# Recipe:: uchiwa
#

include_recipe 'chef-vault'

sensu_creds = chef_vault_item('sensu', 'credentials')

node.default['uchiwa']['version'] = '0.6.0-1'
node.default['uchiwa']['settings']['user'] = ''
node.default['uchiwa']['settings']['pass'] = ''
node.default['uchiwa']['settings']['user'] = sensu_creds['user']
node.default['uchiwa']['settings']['pass'] = sensu_creds['password']

apt_preference 'uchiwa' do
pin "version #{node['uchiwa']['version']}"

0 comments on commit 9fb3937

Please sign in to comment.