Configure eddie as a database master

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 86c7d0250d14b7cc7c6346a34c2f3681973212d3..41a4e7f71935e018806e296b53ef4ac4b659ce57 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"


@@ -33,9 +30,14 @@ end
 package "xz-utils"
 package "openssl"
 
 package "xz-utils"
 package "openssl"
 

+# oathtool for QoS token
+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] }
 

+web_passwords = data_bag_item("web", "passwords")
+

 tilecaches.each do |cache|
   cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address|
     firewall_rule "accept-squid" do
 tilecaches.each do |cache|
   cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address|
     firewall_rule "accept-squid" do


@@ -77,7 +79,7 @@ template "/etc/logrotate.d/squid" do
   source "logrotate.squid.erb"
   owner "root"
   group "root"
   source "logrotate.squid.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 nginx_site "default" do
 end
 
 nginx_site "default" do


@@ -88,24 +90,45 @@ 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
+template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
+  source "nginx_generate_tilecache_qos_map.erb"
+  owner "root"
+  group "root"
+  mode 0o750
+  variables :totp_key => web_passwords["totp_key"]

 end
 
 end
 

-service "nginx-certificate-restart" do
-  service_name "nginx"
-  action :nothing
-  subscribes :restart, "cookbook_file[/etc/ssl/certs/rapidssl.pem]"
-  subscribes :restart, "cookbook_file[/etc/ssl/certs/#{certificate}.pem]"
-  subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]"
+template "/etc/cron.d/tilecache" do
+  source "cron.erb"
+  owner "root"
+  group "root"
+  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"
+  action :run
+end
+
+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 "nginx_tile_ssl.conf.erb"
+  variables :resolvers => resolvers, :caches => tilecaches

 end
 
 template "/etc/logrotate.d/nginx" do
   source "logrotate.nginx.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/logrotate.d/nginx" do
   source "logrotate.nginx.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 tilerenders.each do |render|
 end
 
 tilerenders.each do |render|