try username/password auth for uchiwa

rubygems · Mar 14, 2015 · 9fb3937 · 9fb3937
1 parent 96e7275
commit 9fb3937
Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -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)

diff --git a/cookbooks/rubygems-monitoring/metadata.rb b/cookbooks/rubygems-monitoring/metadata.rb
@@ -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'

diff --git a/cookbooks/rubygems-monitoring/templates/default/nginx.conf.erb b/cookbooks/rubygems-monitoring/templates/default/nginx.conf.erb
@@ -31,7 +31,7 @@ server {
   proxy_redirect off;
 
   location / {
-    proxy_pass http://localhost:3001;
+    proxy_pass http://localhost:3000;
   }
 
 }
diff --git a/cookbooks/rubygems-sensu/metadata.rb b/cookbooks/rubygems-sensu/metadata.rb
@@ -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'

diff --git a/cookbooks/rubygems-sensu/recipes/uchiwa.rb b/cookbooks/rubygems-sensu/recipes/uchiwa.rb
@@ -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']}"