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 (file)
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 1a90ab1f6a0126cd38af7597f53a5d4c00be6f0d..06fa95a007024ed8df6e6de878d81a542476be89 100644 (file)
--- 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