X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cb90c668918b4f95a83662dc08c584bc5f5b62e2..ee5fa2341dacd447e56d5c8a1f77d140c1608ba1:/cookbooks/nginx/recipes/default.rb

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 853f8e5a7..085428583 100644
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -17,45 +17,33 @@
 # limitations under the License.
 #
 
-package "nginx"
+include_recipe "apt::nginx"
+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 "/var/cache/nginx/fastcgi-cache" do
+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
 
-directory "/var/cache/nginx/proxy-cache" do
+directory node[:nginx][:cache][:proxy][:directory] do
   owner "www-data"
   group "root"
-  mode 0o755
-  only_if { node[:nginx][:cache][:proxy][:enable] }
-end
-
-# Temporary Cleanup to remove old levels=1:2 cache after migration to 2:2:2
-execute "nginx-remove-old-fastcgi-cache" do
-  command "/usr/bin/find /var/cache/nginx/fastcgi-cache/ -mindepth 3 -maxdepth 3 -type f -delete"
-  ignore_failure true
-  only_if { node[:nginx][:cache][:fastcgi][:enable] }
-end
-
-# Temporary Cleanup to remove old levels=1:2 cache after migration to 2:2:2
-execute "nginx-remove-old-proxy-cache" do
-  command "/usr/bin/find /var/cache/nginx/proxy-cache/ -mindepth 3 -maxdepth 3 -type f -delete"
-  ignore_failure true
+  mode "755"
+  recursive true
   only_if { node[:nginx][:cache][:proxy][:enable] }
 end
 
@@ -73,3 +61,8 @@ 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