Add IPv6 addresses to dulcy

[chef.git] / cookbooks / nginx / recipes / default.rb

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 72f93e849d363b27ff0fb0dc593c85628a792d0f..3fcb20fdbda680e1a9ec4df392df59d72df8e7e8 100644 (file)
--- 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,47 +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
-
-template "/usr/local/bin/nginx-old-cache-cleanup" do
-  source "nginx-old-cache-cleanup.erb"
-  owner "root"
-  group "root"
-  mode "755"
-end
-
-systemd_service "nginx-old-cache-cleanup" do
-  description "Cleanup nginx cache"
-  exec_start "/usr/local/bin/nginx-old-cache-cleanup"
-  user "www-data"
-  nice 19
-  io_scheduling_class "idle"
-  runtime_max_sec 6 * 60 * 60
-  sandbox true
-  read_write_paths "/var/cache/nginx"
-end
-
-systemd_timer "nginx-old-cache-cleanup" do
-  description "Cleanup nginx cache"
-  on_calendar "23:15"
-end
-
-service "nginx-old-cache-cleanup.timer" do
-  action [:enable, :start]
-end
-
-cron_d "nginx-old-cache-cleanup" do
-  action :delete
-end