X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ffdc1400431395dfad46e36c05f79466109d36b6..8724d4f9c9bf439e5dc28a05f04c1a80ca7498c4:/cookbooks/nginx/recipes/default.rb

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index f17e3dc44..d215e51c8 100644
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -19,6 +19,8 @@
 
 include_recipe "apt"
 include_recipe "munin"
+include_recipe "prometheus"
+include_recipe "ssl"
 
 package "nginx"
 
@@ -26,13 +28,13 @@ template "/etc/nginx/nginx.conf" do
   source "nginx.conf.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
 end
 
 directory node[:nginx][:cache][:fastcgi][:directory] do
   owner "www-data"
   group "root"
-  mode 0o755
+  mode "755"
   recursive true
   only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end
@@ -40,7 +42,7 @@ end
 directory node[:nginx][:cache][:proxy][:directory] do
   owner "www-data"
   group "root"
-  mode 0o755
+  mode "755"
   recursive true
   only_if { node[:nginx][:cache][:proxy][:enable] }
 end
@@ -60,16 +62,21 @@ package "libwww-perl"
 munin_plugin "nginx_request"
 munin_plugin "nginx_status"
 
+prometheus_exporter "nginx" do
+  port 9113
+  options "--nginx.scrape-uri=http://localhost:8050/nginx_status"
+end
+
 template "/usr/local/bin/nginx-old-cache-cleanup" do
   source "nginx-old-cache-cleanup.erb"
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
 end
 
-template "/etc/cron.d/nginx-old-cache-cleanup" do
-  source "nginx-old-cache-cleanup.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+cron_d "nginx-old-cache-cleanup" do
+  minute "15"
+  hour "23"
+  user "www-data"
+  command "/usr/bin/timeout 6h /usr/local/bin/nginx-old-cache-cleanup"
 end