From 13fbc9e8eb2a27363fa2ab2eb0e7b7ad0d8b56f7 Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Thu, 25 Sep 2025 13:53:33 +0100
Subject: [PATCH] Switch chef and web logrotate to zstd

---
 cookbooks/chef/templates/default/logrotate.erb    | 4 ++++
 cookbooks/web/templates/default/logrotate.web.erb | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cookbooks/chef/templates/default/logrotate.erb b/cookbooks/chef/templates/default/logrotate.erb
index ecaf25219..451a1c18b 100644
--- a/cookbooks/chef/templates/default/logrotate.erb
+++ b/cookbooks/chef/templates/default/logrotate.erb
@@ -4,6 +4,10 @@
   rotate 12
   weekly
   compress
+  compresscmd /usr/bin/zstd
+  compressext .zst
+  compressoptions -T0 --adapt
+  uncompresscmd /usr/bin/unzstd
   postrotate
 	systemctl try-restart chef-client.service
   endscript
diff --git a/cookbooks/web/templates/default/logrotate.web.erb b/cookbooks/web/templates/default/logrotate.web.erb
index 82b08c1c0..0f4004eee 100644
--- a/cookbooks/web/templates/default/logrotate.web.erb
+++ b/cookbooks/web/templates/default/logrotate.web.erb
@@ -6,6 +6,10 @@
   rotate 7
   compress
   delaycompress
+  compresscmd /usr/bin/zstd
+  compressext .zst
+  compressoptions -T0 --adapt
+  uncompresscmd /usr/bin/unzstd
   notifempty
   su rails rails
   create 0660 rails rails
@@ -22,7 +26,7 @@
 <% end -%>
 <% if node[:recipes].include?("web::cgimap") -%>
     /bin/systemctl reload cgimap
-    /usr/bin/rsync --preallocate <%= node[:web][:log_directory] %>/cgimap.log.2.gz backup.openstreetmap.org::logs/www.openstreetmap.org/cgimap-<%= node[:hostname] %>-`date -d "-2 days" +%Y-%m-%d`.gz
+    /usr/bin/rsync --preallocate <%= node[:web][:log_directory] %>/cgimap.log.2.zst backup.openstreetmap.org::logs/www.openstreetmap.org/cgimap-<%= node[:hostname] %>-`date -d "-2 days" +%Y-%m-%d`.zst
 <% end -%>
   endscript
 }
-- 
2.39.5