vectortile: track osm2pgsql db age

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

diff --git a/cookbooks/vectortile/recipes/default.rb b/cookbooks/vectortile/recipes/default.rb
index 37fe86b43d379d26744332666ef5cd9c6be24700..99211975ead7a5d4de1fb7dae9db2a5b90a74b77 100644 (file)
--- a/cookbooks/vectortile/recipes/default.rb
+++ b/cookbooks/vectortile/recipes/default.rb
@@ -40,7 +40,7 @@ nginx_site "vector.openstreetmap.org" do
 end
 
 ssl_certificate node[:fqdn] do
-  domains [node[:fqdn], "vector.openstreetmap.org"]
+  domains [node[:fqdn]]
   notifies :reload, "service[nginx]"
 end
 
@@ -99,7 +99,7 @@ end
 python_package "tilekiln" do
   python_virtualenv tilekiln_directory
   python_version "3"
-  version "0.5.1"
+  version "0.6.3"
 end
 
 template "/srv/vector.openstreetmap.org/html/index.html" do
@@ -222,7 +222,7 @@ systemd_service "tilekiln" do
   wants "postgresql.service"
   sandbox :enable_network => true
   restrict_address_families "AF_UNIX"
-  exec_start "#{tilekiln_directory}/bin/tilekiln serve #{tilekiln_mode} --storage-dbname tiles --num-threads #{node[:vectortile][:serve][:threads]}"
+  exec_start "#{tilekiln_directory}/bin/tilekiln serve #{tilekiln_mode} --storage-dbname tiles --num-threads #{node[:vectortile][:serve][:threads]} --base-url 'https://vector.openstreetmap.org'"
 end
 
 service "tilekiln" do
@@ -280,3 +280,17 @@ else
     action [:stop, :disable]
   end
 end
+
+package %w[
+  ruby-pg
+  ruby-webrick
+]
+
+prometheus_exporter "osm2pgsql" do
+  port 10027
+  user "tileupdate"
+  restrict_address_families "AF_UNIX"
+  options [
+    "--database-name=spirit"
+  ]
+end