X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/184a48717ac0a4332b426980a0d48771ec7fed64..3e112e5d63c83023122e5055b82294f35d33a458:/cookbooks/tilecache/recipes/default.rb diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb index 13f752cd1..5c4907b69 100644 --- 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 # -# 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, @@ -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 @@ -65,19 +77,62 @@ squid_fragment "tilecache" do variables :caches => tilecaches, :renders => tilerenders end +package "rsync" + 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 -nginx_site "tile-ssl" do - template "nginx_tile_ssl.conf.erb" +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", + "tile.osm.org", + "a.tile.osm.org", + "b.tile.osm.org", + "c.tile.osm.org"] + notifies :restart, "service[nginx]" +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|