X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0751a4f9434ce69a40996fbec967501fe43e4f83..dd7f629ab3f1404a2a3ea5a9c4e28c416ecb6e3b:/cookbooks/nginx/recipes/default.rb diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb index a7775c162..d215e51c8 100644 --- a/cookbooks/nginx/recipes/default.rb +++ b/cookbooks/nginx/recipes/default.rb @@ -19,6 +19,7 @@ include_recipe "apt" include_recipe "munin" +include_recipe "prometheus" include_recipe "ssl" package "nginx" @@ -27,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 @@ -41,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 @@ -61,11 +62,16 @@ 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 cron_d "nginx-old-cache-cleanup" do