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 13f752cd1382c6527ea299cc906c254474bfd037..a69b6ed8dda6e6d0966ed7cd9a4156e935fc2996 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,17 +17,29 @@
 # limitations under the License.
 #
 
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "tile.openstreetmap" ]
+require "ipaddr"
 
 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"
 
-package "xz-utils"
+package "apache2" do
+  action :remove
+end
+
+package %w[
+  xz-utils
+  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] }
 
+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
@@ -69,15 +81,56 @@ template "/etc/logrotate.d/squid" do
   source "logrotate.squid.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 nginx_site "default" do
-  action [ :delete ]
+  action [:delete]
+end
+
+resolvers = node[:networking][:nameservers].map do |resolver|
+  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
+end
+
+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
+
+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"
+  template_source "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"
+  mode 0o644
 end
 
 tilerenders.each do |render|
@@ -87,3 +140,7 @@ tilerenders.each do |render|
     conf_variables :host => render[:fqdn]
   end
 end
+
+Dir.glob("/var/log/nginx/access.log*") do |log|
+  File.unlink(log)
+end