tilecache: fix token in databag

[chef.git] / cookbooks / tilecache / recipes / default.rb

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 87b27bc018e319ffd757b7578a3fa811b7f35e1a..f188964796cf4929e6b86e4abfc4b3f8d3d16919 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -39,7 +39,7 @@ package "oathtool"
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 tilerenders = search(:node, "roles:tile").sort_by { |n| n[:hostname] }
 
-tilecache_tokens = data_bag_item("tilecache", "tokens")
+web_passwords = data_bag_item("web", "passwords")
 
 tilecaches.each do |cache|
   cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address|
@@ -103,7 +103,7 @@ template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
   owner "root"
   group "root"
   mode 0o750
-  variables tokens: => tilecache_tokens
+  variables :web_passwords => web_passwords
 end
 
 template "/etc/cron.d/tilecache" do
@@ -113,9 +113,9 @@ template "/etc/cron.d/tilecache" do
   mode 0o644
 end
 
-execute 'execute_nginx_generate_tilecache_qos_map' do
-  command '/usr/local/bin/nginx_generate_tilecache_qos_map'
-  creates '/etc/nginx/conf.d/tile_qos_rates.map'
+execute "execute_nginx_generate_tilecache_qos_map" do
+  command "/usr/local/bin/nginx_generate_tilecache_qos_map"
+  creates "/etc/nginx/conf.d/tile_qos_rates.map"
   action :run
 end