X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/93c098cdc4f22b1fe69ecd88b3ac2d2b211780ff..61ec6091e1dc00f690b1eb8a1a624f9e73daf324:/cookbooks/tilecache/recipes/default.rb?ds=inline diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb index 5c1cdba3c..4afda5568 100644 --- a/cookbooks/tilecache/recipes/default.rb +++ b/cookbooks/tilecache/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: tilecache +# Cookbook:: tilecache # Recipe:: default # -# Copyright 2011, OpenStreetMap Foundation +# Copyright:: 2011, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ require "ipaddr" include_recipe "ssl" include_recipe "squid" include_recipe "nginx" +include_recipe "fail2ban" package "apache2" do action :remove @@ -77,6 +78,8 @@ squid_fragment "tilecache" do variables :caches => tilecaches, :renders => tilerenders end +package "rsync" + template "/etc/logrotate.d/squid" do source "logrotate.squid.erb" owner "root" @@ -113,7 +116,11 @@ ssl_certificate "tile.openstreetmap.org" do domains ["tile.openstreetmap.org", "a.tile.openstreetmap.org", "b.tile.openstreetmap.org", - "c.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 @@ -129,6 +136,10 @@ template "/etc/logrotate.d/nginx" do mode 0o644 end +fail2ban_jail "squid" do + maxretry 1000 +end + tilerenders.each do |render| munin_plugin "ping_#{render[:fqdn]}" do target "ping_" @@ -136,7 +147,3 @@ tilerenders.each do |render| conf_variables :host => render[:fqdn] end end - -Dir.glob("/var/log/nginx/access.log*") do |log| - File.unlink(log) -end