X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/87655058a50a160829441281f58f5a78441302f4..d18cd92a98384aebf371376383a4408485f12374:/cookbooks/nginx/recipes/default.rb diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb index 1cc5e5b46..d8e9d4d2b 100644 --- a/cookbooks/nginx/recipes/default.rb +++ b/cookbooks/nginx/recipes/default.rb @@ -17,8 +17,7 @@ # limitations under the License. # -include_recipe "apt" -include_recipe "munin" +include_recipe "apt::nginx" include_recipe "prometheus" include_recipe "ssl" @@ -53,29 +52,7 @@ service "nginx" do subscribes :restart, "template[/etc/nginx/nginx.conf]" end -munin_plugin_conf "nginx" do - template "munin.erb" -end - -package "libwww-perl" - -munin_plugin "nginx_request" -munin_plugin "nginx_status" - prometheus_exporter "nginx" do port 9113 -end - -template "/usr/local/bin/nginx-old-cache-cleanup" do - source "nginx-old-cache-cleanup.erb" - owner "root" - group "root" - mode "755" -end - -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" + options "--nginx.scrape-uri=http://localhost:8050/nginx_status" end