Merge branch 'main' into 528-enhance-roundup-group-perms

JacobCoffee · web-flow · commit 69be1e59806c · 2024-11-27T06:53:12.000-06:00
diff --git a/salt/cdn-logs/config/fastly.logrotate.conf b/salt/cdn-logs/config/fastly.logrotate.conf
@@ -7,6 +7,6 @@
     delaycompress
     sharedscripts
     postrotate
-        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
+        /usr/lib/rsyslog/rsyslog-rotate
     endscript
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`delaycompress`
`8`	`8`	`sharedscripts`
`9`	`9`	`postrotate`
`10`		- /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null \|\| true
	`10`	`+ /usr/lib/rsyslog/rsyslog-rotate`
`11`	`11`	`endscript`
`12`	`12`	`}`