X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/480d54a8957ad07025a37ecb63181be2a5e6d129..58fa98e466c9b59f9352240e86c6349eba21440e:/cookbooks/nginx/recipes/default.rb

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 480937407..d215e51c8 100644
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -17,24 +17,24 @@
 # limitations under the License.
 #
 
-package "nginx"
+include_recipe "apt"
+include_recipe "munin"
+include_recipe "prometheus"
+include_recipe "ssl"
 
-resolvers = node[:networking][:nameservers].map do |resolver|
-  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
-end
+package "nginx"
 
 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"
-  mode 0o755
+  mode "755"
   recursive true
   only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end
@@ -42,7 +42,7 @@ end
 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
@@ -50,7 +50,7 @@ end
 service "nginx" do
   action [:enable] # Do not start the service as config may be broken from failed chef run
   supports :status => true, :restart => true, :reload => true
-  subscribes :restart, "template[/etc/nginx/nginx.conf]", :immediately
+  subscribes :restart, "template[/etc/nginx/nginx.conf]"
 end
 
 munin_plugin_conf "nginx" do
@@ -61,3 +61,22 @@ 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
+
+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