X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e9a6a2a72736c2196f124a78ad569292de83f18b..98c8d0026a2836abf350ac2a393930ff81cef41c:/cookbooks/tile/recipes/default.rb diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index a9b503c1c..979c012d5 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -29,6 +29,7 @@ include_recipe "ruby" include_recipe "tools" blocks = data_bag_item("tile", "blocks") +admins = data_bag_item("apache", "admins") web_passwords = data_bag_item("web", "passwords") apache_module "alias" @@ -59,6 +60,14 @@ end fastlyips = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/fastly-ip-list.json")) +remote_file "#{Chef::Config[:file_cache_path]}/statuscake-locations.json" do + source "https://app.statuscake.com/Workfloor/Locations.php?format=json" + compile_time true + ignore_failure true +end + +statuscakelocations = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/statuscake-locations.json")) + apache_site "default" do action :disable end @@ -69,7 +78,9 @@ end apache_site "tile.openstreetmap.org" do template "apache.erb" - variables :fastly => fastlyips["addresses"] + variables :fastly => fastlyips["addresses"] + fastlyips["ipv6_addresses"], + :statuscake => statuscakelocations.flat_map { |_, v| [v["ip"], v["ipv6"]] }, + :admins => admins["hosts"] end template "/etc/logrotate.d/apache2" do @@ -114,10 +125,6 @@ systemd_service "renderd" do restart "on-failure" end -systemd_service "renderd" do - action :delete -end - service "renderd" do action [:enable, :start] subscribes :restart, "systemd_service[renderd]" @@ -187,11 +194,22 @@ template "/srv/tile.openstreetmap.org/cgi-bin/debug" do mode "755" end -template "/etc/cron.hourly/export" do - source "export.cron.erb" - owner "root" - group "root" - mode "755" +systemd_service "export-cleanup" do + description "Cleanup stale export temporary files" + joins_namespace_of "apache2.service" + exec_start "find /tmp -ignore_readdir_race -name 'export??????' -mmin +60 -delete" + user "www-data" + sandbox true +end + +systemd_timer "export-cleanup" do + description "Cleanup stale export temporary files" + on_boot_sec "60m" + on_unit_inactive_sec "60m" +end + +service "export-cleanup.timer" do + action [:enable, :start] end directory "/srv/tile.openstreetmap.org/data" do @@ -432,7 +450,7 @@ postgresql_extension "hstore" do only_if { node[:tile][:database][:hstore] } end -%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys].each do |table| +%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews].each do |table| postgresql_table table do cluster node[:tile][:database][:cluster] database "gis" @@ -441,7 +459,7 @@ end end end -%w[geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads].each do |table| +%w[geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads spatial_ref_sys].each do |table| postgresql_table table do cluster node[:tile][:database][:cluster] database "gis" @@ -627,11 +645,9 @@ service "replicate" do subscribes :restart, "systemd_service[replicate]" end -template "/etc/logrotate.d/replicate" do - source "replicate.logrotate.erb" - owner "root" - group "root" - mode "644" +# FIXME: cleanup old replicate logrotate +file "/etc/logrotate.d/replicate" do + action :delete end template "/usr/local/bin/render-lowzoom" do