From: Grant Slater <github@firefishy.com>
Date: Wed, 30 Nov 2022 06:59:09 +0000 (+0000)
Subject: nginx: Remove old cache cleanup script
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/494698d937f4b47e6110e1eefc7d84822dc91562

nginx: Remove old cache cleanup script
---

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 72f93e849..3a41ca51f 100644
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -67,31 +67,21 @@ prometheus_exporter "nginx" do
   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"
+# Remove old nginx cleanup script
+service "nginx-old-cache-cleanup.timer" do
+  action [:stop, :disable]
 end
 
-systemd_service "nginx-old-cache-cleanup" do
-  description "Cleanup nginx cache"
-  exec_start "/usr/local/bin/nginx-old-cache-cleanup"
-  user "www-data"
-  nice 19
-  io_scheduling_class "idle"
-  runtime_max_sec 6 * 60 * 60
-  sandbox true
-  read_write_paths "/var/cache/nginx"
+systemd_timer "nginx-old-cache-cleanup" do
+  action :delete
 end
 
-systemd_timer "nginx-old-cache-cleanup" do
-  description "Cleanup nginx cache"
-  on_calendar "23:15"
+systemd_service "nginx-old-cache-cleanup" do
+  action :delete
 end
 
-service "nginx-old-cache-cleanup.timer" do
-  action [:enable, :start]
+file "/usr/local/bin/nginx-old-cache-cleanup" do
+  action :delete
 end
 
 cron_d "nginx-old-cache-cleanup" do
diff --git a/cookbooks/nginx/templates/default/nginx-old-cache-cleanup.erb b/cookbooks/nginx/templates/default/nginx-old-cache-cleanup.erb
deleted file mode 100644
index 7bd158fc6..000000000
--- a/cookbooks/nginx/templates/default/nginx-old-cache-cleanup.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-[[ -d "/var/cache/nginx/fastcgi-cache" ]] && /usr/bin/find /var/cache/nginx/fastcgi-cache/?/??/ -maxdepth 1 -type f -delete 2>/dev/null || /bin/true
-[[ -d "/var/cache/nginx/fastcgi-cache" ]] && /usr/bin/find /var/cache/nginx/fastcgi-cache/ -maxdepth 2 -mindepth 2 -type d -wholename '*/?/??' -delete
-[[ -d "/var/cache/nginx/fastcgi-cache" ]] && /usr/bin/find /var/cache/nginx/fastcgi-cache/ -maxdepth 1 -mindepth 1 -type d -wholename '*/?' -delete
-[[ -d "/var/cache/nginx/proxy-cache" ]] && /usr/bin/find /var/cache/nginx/proxy-cache/?/??/ -maxdepth 1 -type f -delete 2>/dev/null || /bin/true
-[[ -d "/var/cache/nginx/proxy-cache" ]] && /usr/bin/find /var/cache/nginx/proxy-cache/ -maxdepth 2 -mindepth 2 -type d -wholename '*/?/??' -delete
-[[ -d "/var/cache/nginx/proxy-cache" ]] && /usr/bin/find /var/cache/nginx/proxy-cache/ -maxdepth 1 -mindepth 1 -type d -wholename '*/?' -delete
-
-exit 0