X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/494698d937f4b47e6110e1eefc7d84822dc91562..11fdeeaa56975b200a46cc3ee7124e529621fba9:/cookbooks/nginx/recipes/default.rb diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb index 3a41ca51f..3fcb20fdb 100644 --- a/cookbooks/nginx/recipes/default.rb +++ b/cookbooks/nginx/recipes/default.rb @@ -18,11 +18,13 @@ # include_recipe "apt::nginx" -include_recipe "munin" include_recipe "prometheus" include_recipe "ssl" -package "nginx" +package %w[ + nginx + logrotate +] template "/etc/nginx/nginx.conf" do source "nginx.conf.erb" @@ -53,37 +55,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 options "--nginx.scrape-uri=http://localhost:8050/nginx_status" end - -# Remove old nginx cleanup script -service "nginx-old-cache-cleanup.timer" do - action [:stop, :disable] -end - -systemd_timer "nginx-old-cache-cleanup" do - action :delete -end - -systemd_service "nginx-old-cache-cleanup" do - action :delete -end - -file "/usr/local/bin/nginx-old-cache-cleanup" do - action :delete -end - -cron_d "nginx-old-cache-cleanup" do - action :delete -end