Remove old cogent addresses from various ACLs

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

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index cfd79376dab764296ce7c9e700483ec06fb1bf42..085428583ef5e540deb4ce738011181ce2ac19ff 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -17,8 +17,9 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apt"
+include_recipe "apt::nginx"

 include_recipe "munin"
 include_recipe "munin"

+include_recipe "prometheus"

 include_recipe "ssl"
 
 package "nginx"
 include_recipe "ssl"
 
 package "nginx"


@@ -27,13 +28,13 @@ template "/etc/nginx/nginx.conf" do
   source "nginx.conf.erb"
   owner "root"
   group "root"
   source "nginx.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 directory node[:nginx][:cache][:fastcgi][:directory] do
   owner "www-data"
   group "root"
 end
 
 directory node[:nginx][:cache][:fastcgi][:directory] do
   owner "www-data"
   group "root"

-  mode 0o755
+  mode "755"

   recursive true
   only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end
   recursive true
   only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end


@@ -41,7 +42,7 @@ end
 directory node[:nginx][:cache][:proxy][:directory] do
   owner "www-data"
   group "root"
 directory node[:nginx][:cache][:proxy][:directory] do
   owner "www-data"
   group "root"

-  mode 0o755
+  mode "755"

   recursive true
   only_if { node[:nginx][:cache][:proxy][:enable] }
 end
   recursive true
   only_if { node[:nginx][:cache][:proxy][:enable] }
 end


@@ -61,16 +62,7 @@ package "libwww-perl"
 munin_plugin "nginx_request"
 munin_plugin "nginx_status"
 
 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 0o755
-end
-
-template "/etc/cron.d/nginx-old-cache-cleanup" do
-  source "nginx-old-cache-cleanup.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+prometheus_exporter "nginx" do
+  port 9113
+  options "--nginx.scrape-uri=http://localhost:8050/nginx_status"

 end
 end