wordpress: use combined_extended logging

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

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 1cc5e5b46abd1ada864ba7627e78d948183a96b5..085428583ef5e540deb4ce738011181ce2ac19ff 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apt"
+include_recipe "apt::nginx"
 include_recipe "munin"
 include_recipe "prometheus"
 include_recipe "ssl"
@@ -64,18 +64,5 @@ 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