Nominatim: search_country table got removed in April

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 209a83dc969f3166059e13f000b5303016ddb9e8..5c1cdba3c382df13993e58e70e704b7591a62192 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,17 +17,29 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "tile.openstreetmap" ]
+require "ipaddr"

 
 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"
 
 
 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] }
 
 
 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


@@ -46,7 +58,7 @@ tilecaches.each do |cache|
       dest "fw"
       proto "udp"
       dest_ports "3130"
       dest "fw"
       proto "udp"
       dest_ports "3130"

-      source_ports "1024:"
+      source_ports "3130"

     end
     firewall_rule "accept-squid-icp-reply" do
       action :accept
     end
     firewall_rule "accept-squid-icp-reply" do
       action :accept


@@ -55,7 +67,7 @@ tilecaches.each do |cache|
       dest "net:#{address}"
       proto "udp"
       dest_ports "3130"
       dest "net:#{address}"
       proto "udp"
       dest_ports "3130"

-      source_ports "1024:"
+      source_ports "3130"

     end
   end
 end
     end
   end
 end


@@ -69,14 +81,62 @@ 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

-  action [ :delete ]
+  action [:delete]
+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
 
 end
 

-nginx_site "tile-ssl" do
-  template "nginx_tile_ssl.conf.erb"
+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
 
 end
 

+nginx_site "tile" do
+  template "nginx_tile.conf.erb"
+  variables :caches => tilecaches
+end
+
+template "/etc/logrotate.d/nginx" do
+  source "logrotate.nginx.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end
+
+tilerenders.each do |render|
+  munin_plugin "ping_#{render[:fqdn]}" do
+    target "ping_"
+    conf "munin.ping.erb"
+    conf_variables :host => render[:fqdn]
+  end
+end
+
+Dir.glob("/var/log/nginx/access.log*") do |log|
+  File.unlink(log)
+end