Add shorewall stoppedrules support

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 241b73a8e9283d6be225a88cbaf035bd067d35e9..6aeedaae837e0c2831ca6e95ef884bbc389954c2 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -41,6 +41,10 @@ apache_module "tile" do
   conf "tile.conf.erb"
 end
 
   conf "tile.conf.erb"
 end
 

+apache_conf "renderd" do
+  action :disable
+end
+

 ssl_certificate node[:fqdn] do
   domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
   notifies :reload, "service[apache2]"
 ssl_certificate node[:fqdn] do
   domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
   notifies :reload, "service[apache2]"


@@ -49,18 +53,22 @@ end
 remote_file "#{Chef::Config[:file_cache_path]}/fastly-ip-list.json" do
   source "https://api.fastly.com/public-ip-list"
   compile_time true
 remote_file "#{Chef::Config[:file_cache_path]}/fastly-ip-list.json" do
   source "https://api.fastly.com/public-ip-list"
   compile_time true

+  ignore_failure true

 end
 
 end
 

-tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }

 fastlyips = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/fastly-ip-list.json"))
 
 apache_site "default" do
 fastlyips = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/fastly-ip-list.json"))
 
 apache_site "default" do

-  action [:disable]
+  action :disable
+end
+
+apache_site "tileserver_site" do
+  action :disable

 end
 
 apache_site "tile.openstreetmap.org" do
   template "apache.erb"
 end
 
 apache_site "tile.openstreetmap.org" do
   template "apache.erb"

-  variables :caches => tilecaches, :fastly => fastlyips["addresses"]
+  variables :fastly => fastlyips["addresses"]

 end
 
 template "/etc/logrotate.d/apache2" do
 end
 
 template "/etc/logrotate.d/apache2" do


@@ -76,6 +84,18 @@ directory "/srv/tile.openstreetmap.org" do
   mode "755"
 end
 
   mode "755"
 end
 

+directory "/srv/tile.openstreetmap.org/conf" do
+  owner "tile"
+  group "tile"
+  mode "755"
+end
+
+file "/srv/tile.openstreetmap.org/conf/ip.map" do
+  owner "tile"
+  group "adm"
+  mode "644"
+end
+

 package "renderd"
 
 systemd_service "renderd" do
 package "renderd"
 
 systemd_service "renderd" do


@@ -86,6 +106,7 @@ systemd_service "renderd" do
   exec_start "/usr/bin/renderd -f"
   runtime_directory "renderd"
   standard_error "null"
   exec_start "/usr/bin/renderd -f"
   runtime_directory "renderd"
   standard_error "null"

+  limit_nofile 4096

   private_tmp true
   private_devices true
   private_network true
   private_tmp true
   private_devices true
   private_network true


@@ -272,8 +293,10 @@ nodejs_package "carto"
 
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
 
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"

+  conflicts "render-lowzoom.service"

   user "tile"
   exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"
   user "tile"
   exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"

+  runtime_directory "update-lowzoom-%i"

   private_tmp true
   private_devices true
   private_network true
   private_tmp true
   private_devices true
   private_network true


@@ -424,6 +447,22 @@ end
   end
 end
 
   end
 end
 

+package %w[
+  gdal-bin
+  python3-yaml
+  python3-psycopg2
+]
+
+if node[:tile][:database][:external_data_script]
+  execute node[:tile][:database][:external_data_script] do
+    command "#{node[:tile][:database][:external_data_script]} -R www-data"
+    cwd "/srv/tile.openstreetmap.org"
+    user "tile"
+    group "tile"
+    ignore_failure true
+  end
+end
+

 postgresql_munin "gis" do
   cluster node[:tile][:database][:cluster]
   database "gis"
 postgresql_munin "gis" do
   cluster node[:tile][:database][:cluster]
   database "gis"


@@ -456,6 +495,10 @@ package %w[
   python3-pyproj
 ]
 
   python3-pyproj
 ]
 

+gem_package "apachelogregex"
+gem_package "file-tail"
+gem_package "lru_redux"
+

 remote_directory "/usr/local/bin" do
   source "bin"
   owner "root"
 remote_directory "/usr/local/bin" do
   source "bin"
   owner "root"


@@ -466,6 +509,35 @@ remote_directory "/usr/local/bin" do
   files_mode "755"
 end
 
   files_mode "755"
 end
 

+template "/usr/local/bin/tile-ratelimit" do
+  source "tile-ratelimit.erb"
+  owner "root"
+  group "root"
+  mode "755"
+end
+
+systemd_service "tile-ratelimit" do
+  description "Monitor tile requests and enforce rate limits"
+  after "apache2.service"
+  user "tile"
+  group "adm"
+  exec_start "/usr/local/bin/tile-ratelimit"
+  private_tmp true
+  private_devices true
+  private_network true
+  protect_system "full"
+  protect_home true
+  read_write_paths "/srv/tile.openstreetmap.org/conf"
+  no_new_privileges true
+  restart "on-failure"
+end
+
+service "tile-ratelimit" do
+  action [:enable, :start]
+  subscribes :restart, "file[/usr/local/bin/tile-ratelimit]"
+  subscribes :restart, "systemd_service[tile-ratelimit]"
+end
+

 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"


@@ -552,6 +624,7 @@ end
 
 systemd_service "render-lowzoom" do
   description "Render low zoom tiles"
 
 systemd_service "render-lowzoom" do
   description "Render low zoom tiles"

+  condition_path_exists_glob "!/run/update-lowzoom-*"

   user "tile"
   exec_start "/usr/local/bin/render-lowzoom"
   private_tmp true
   user "tile"
   exec_start "/usr/local/bin/render-lowzoom"
   private_tmp true


@@ -609,10 +682,10 @@ munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"
 
 
 munin_plugin "replication_delay"
 

-prometheus_collector "modtile" do
-  interval "1m"
+prometheus_exporter "modtile" do
+  port 9494

 end
 
 end
 

-prometheus_collector "renderd" do
-  interval "1m"
+prometheus_exporter "renderd" do
+  port 9393

 end
 end