From: Andreas Glashauser <ag@andreasglashauser.com>
Date: Tue, 1 Apr 2025 07:53:14 +0000 (+0200)
Subject: CHANGED: Mitigate Fedora issue by replacing file.managed source: in common.logrotate
X-Git-Url: https://git.andreasglashauser.com/?a=commitdiff_plain;h=fd55820a0db68485001a8277d3d3aca94c4d3991;p=salt-qubes.git

CHANGED: Mitigate Fedora issue by replacing file.managed source: in common.logrotate
---

diff --git a/user_salt/common/logrotate/files/force_hourly_log_cleanup b/user_salt/common/logrotate/files/force_hourly_log_cleanup
deleted file mode 100644
index 702e88f..0000000
--- a/user_salt/common/logrotate/files/force_hourly_log_cleanup
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/*log /var/log/**/*log {
-	hourly
-	missingok
-	rotate 1
-	size 1k
-	copytruncate
-	create 0644 root root
-}
diff --git a/user_salt/common/logrotate/init.sls b/user_salt/common/logrotate/init.sls
index 1a90ab1..06fa95a 100644
--- a/user_salt/common/logrotate/init.sls
+++ b/user_salt/common/logrotate/init.sls
@@ -2,7 +2,15 @@
 
 /etc/logrotate.d/force_hourly_log_cleanup:
   file.managed:
-    - source: salt://common/logrotate/files/force_hourly_log_cleanup
+    - contents: |
+        /var/log/*log /var/log/**/*log {
+                hourly
+                missingok
+                rotate 1
+                size 1k
+                copytruncate
+                create 0644 root root
+        }
     - mode: 755
     - user: root
     - group: root