From 246d642c3ab84676925fadcf0038296e74e5437b Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Thu, 25 Sep 2025 13:59:50 +0100
Subject: [PATCH] Switch remaining logrotate to zstd

---
 cookbooks/dev/templates/default/logrotate.apis.erb        | 6 +++++-
 cookbooks/letsencrypt/templates/default/logrotate.erb     | 4 ++++
 cookbooks/nominatim/templates/default/logrotate.nginx.erb | 8 ++++++++
 .../nominatim/templates/default/logrotate.nominatim.erb   | 4 ++++
 cookbooks/overpass/templates/default/logrotate.erb        | 4 ++++
 cookbooks/oxidized/templates/default/logrotate.erb        | 4 ++++
 6 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/cookbooks/dev/templates/default/logrotate.apis.erb b/cookbooks/dev/templates/default/logrotate.apis.erb
index bd984cdd0..d2d1dc1e0 100644
--- a/cookbooks/dev/templates/default/logrotate.apis.erb
+++ b/cookbooks/dev/templates/default/logrotate.apis.erb
@@ -6,11 +6,15 @@
   rotate 7
   compress
   delaycompress
+  compresscmd /usr/bin/zstd
+  compressext .zst
+  compressoptions -T0 --adapt
+  uncompresscmd /usr/bin/unzstd
   notifempty
   create 0660 apis apis
   sharedscripts
   postrotate
     PASSENGER_INSTANCE_REGISTRY_DIR=<%= node[:passenger][:instance_registry_dir] %> /usr/bin/passenger-config restart-app --ignore-app-not-running <%= @rails_directory %> > /dev/null
     /bin/systemctl try-reload-or-restart cgimap@<%= @name %>
-  endscript                                                                     
+  endscript
 }
diff --git a/cookbooks/letsencrypt/templates/default/logrotate.erb b/cookbooks/letsencrypt/templates/default/logrotate.erb
index 57fe6d67b..3a80f1b48 100644
--- a/cookbooks/letsencrypt/templates/default/logrotate.erb
+++ b/cookbooks/letsencrypt/templates/default/logrotate.erb
@@ -3,4 +3,8 @@
 /srv/acme.openstreetmap.org/logs/*.log {
     missingok
     compress
+    compresscmd /usr/bin/zstd
+    compressext .zst
+    compressoptions -T0 --adapt
+    uncompresscmd /usr/bin/unzstd
 }
diff --git a/cookbooks/nominatim/templates/default/logrotate.nginx.erb b/cookbooks/nominatim/templates/default/logrotate.nginx.erb
index 1374fcd46..3cda39725 100644
--- a/cookbooks/nominatim/templates/default/logrotate.nginx.erb
+++ b/cookbooks/nominatim/templates/default/logrotate.nginx.erb
@@ -6,6 +6,10 @@
   rotate 7
   compress
   delaycompress
+  compresscmd /usr/bin/zstd
+  compressext .zst
+  compressoptions -T0 --adapt
+  uncompresscmd /usr/bin/unzstd
   notifempty
   create 640 www-data adm
   sharedscripts
@@ -20,6 +24,10 @@
   rotate 14
   compress
   delaycompress
+  compresscmd /usr/bin/zstd
+  compressext .zst
+  compressoptions -T0 --adapt
+  uncompresscmd /usr/bin/unzstd
   notifempty
   create 640 www-data adm
   sharedscripts
diff --git a/cookbooks/nominatim/templates/default/logrotate.nominatim.erb b/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
index 1ff28a631..838e3b2e9 100644
--- a/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
+++ b/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
@@ -6,6 +6,10 @@
   rotate 8
   compress
   delaycompress
+  compresscmd /usr/bin/zstd
+  compressext .zst
+  compressoptions -T0 --adapt
+  uncompresscmd /usr/bin/unzstd
   notifempty
   postrotate
         systemctl reload nominatim.service
diff --git a/cookbooks/overpass/templates/default/logrotate.erb b/cookbooks/overpass/templates/default/logrotate.erb
index d9f6ac9ab..21421684e 100644
--- a/cookbooks/overpass/templates/default/logrotate.erb
+++ b/cookbooks/overpass/templates/default/logrotate.erb
@@ -3,4 +3,8 @@
 <%= @logdir %>/*.log {
     missingok
     compress
+    compresscmd /usr/bin/zstd
+    compressext .zst
+    compressoptions -T0 --adapt
+    uncompresscmd /usr/bin/unzstd
 }
diff --git a/cookbooks/oxidized/templates/default/logrotate.erb b/cookbooks/oxidized/templates/default/logrotate.erb
index 81adecb66..66f2158eb 100644
--- a/cookbooks/oxidized/templates/default/logrotate.erb
+++ b/cookbooks/oxidized/templates/default/logrotate.erb
@@ -6,5 +6,9 @@
     size 10M
     compress
     delaycompress
+    compresscmd /usr/bin/zstd
+    compressext .zst
+    compressoptions -T0 --adapt
+    uncompresscmd /usr/bin/unzstd
     missingok
 }
-- 
2.39.5