X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aeaa46f3071de018b5c5e0f5678cb5b4082e3ddc..11fdeeaa56975b200a46cc3ee7124e529621fba9:/cookbooks/nginx/recipes/default.rb diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb index 20128a1cb..3fcb20fdb 100644 --- a/cookbooks/nginx/recipes/default.rb +++ b/cookbooks/nginx/recipes/default.rb @@ -17,11 +17,14 @@ # limitations under the License. # -include_recipe "apt" -include_recipe "munin" +include_recipe "apt::nginx" +include_recipe "prometheus" include_recipe "ssl" -package "nginx" +package %w[ + nginx + logrotate +] template "/etc/nginx/nginx.conf" do source "nginx.conf.erb" @@ -52,25 +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" - -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" +prometheus_exporter "nginx" do + port 9113 + options "--nginx.scrape-uri=http://localhost:8050/nginx_status" end