Modernise more LWRPs

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 87b27bc018e319ffd757b7578a3fa811b7f35e1a..a69b6ed8dda6e6d0966ed7cd9a4156e935fc2996 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -19,9 +19,6 @@
 
 require "ipaddr"
 
 
 require "ipaddr"
 

-certificate = node[:tilecache][:ssl][:certificate]
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate]
-

 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"
 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"


@@ -30,8 +27,10 @@ package "apache2" do
   action :remove
 end
 
   action :remove
 end
 

-package "xz-utils"
-package "openssl"
+package %w[
+  xz-utils
+  openssl
+]

 
 # oathtool for QoS token
 package "oathtool"
 
 # oathtool for QoS token
 package "oathtool"


@@ -39,7 +38,7 @@ package "oathtool"
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 tilerenders = search(:node, "roles:tile").sort_by { |n| n[:hostname] }
 
 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|
 
 tilecaches.each do |cache|
   cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address|


@@ -93,17 +92,12 @@ resolvers = node[:networking][:nameservers].map do |resolver|
   IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
 end
 
   IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
 end
 

-nginx_site "tile-ssl" do
-  template "nginx_tile_ssl.conf.erb"
-  variables :certificate => certificate, :resolvers => resolvers, :caches => tilecaches
-end
-

 template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
   source "nginx_generate_tilecache_qos_map.erb"
   owner "root"
   group "root"
   mode 0o750
 template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
   source "nginx_generate_tilecache_qos_map.erb"
   owner "root"
   group "root"
   mode 0o750

-  variables tokens: => tilecache_tokens
+  variables :totp_key => web_passwords["totp_key"]

 end
 
 template "/etc/cron.d/tilecache" do
 end
 
 template "/etc/cron.d/tilecache" do


@@ -113,18 +107,23 @@ template "/etc/cron.d/tilecache" do
   mode 0o644
 end
 
   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
 
   action :run
 end
 

-service "nginx-certificate-restart" do
-  service_name "nginx"
-  action :nothing
-  subscribes :restart, "cookbook_file[/etc/ssl/certs/rapidssl.pem]"
-  subscribes :restart, "file[/etc/ssl/certs/#{certificate}.pem]"
-  subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]"
+ssl_certificate "tile.openstreetmap.org" do
+  domains ["tile.openstreetmap.org",
+           "a.tile.openstreetmap.org",
+           "b.tile.openstreetmap.org",
+           "c.tile.openstreetmap.org"]
+  notifies :restart, "service[nginx]"
+end
+
+nginx_site "tile-ssl" do
+  template_source "nginx_tile_ssl.conf.erb"
+  variables :resolvers => resolvers, :caches => tilecaches

 end
 
 template "/etc/logrotate.d/nginx" do
 end
 
 template "/etc/logrotate.d/nginx" do


@@ -141,3 +140,7 @@ tilerenders.each do |render|
     conf_variables :host => render[:fqdn]
   end
 end
     conf_variables :host => render[:fqdn]
   end
 end

+
+Dir.glob("/var/log/nginx/access.log*") do |log|
+  File.unlink(log)
+end