Restart karma if the service definition changes

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

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index aec734c17f2ae9dc9744b1dcdd78724bfeb58b4a..7053cb1b54e20446cb299f2590a7dd13e4c385c9 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -17,26 +17,24 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "apt::nginx"

 include_recipe "munin"
 include_recipe "munin"

+include_recipe "prometheus"
+include_recipe "ssl"

 
 package "nginx"
 
 
 package "nginx"
 

-resolvers = node[:networking][:nameservers].map do |resolver|
-  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
-end
-

 template "/etc/nginx/nginx.conf" do
   source "nginx.conf.erb"
   owner "root"
   group "root"
 template "/etc/nginx/nginx.conf" do
   source "nginx.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
-  variables :resolvers => resolvers
+  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


@@ -44,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


@@ -63,3 +61,22 @@ package "libwww-perl"
 
 munin_plugin "nginx_request"
 munin_plugin "nginx_status"
 
 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
+
+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"
+end