From a3a8a5ebbad17592a03daef0acef79dd3ef639ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <hno@fedoraproject.org>
Date: Thu, 9 Oct 2008 11:47:06 +0000
Subject: [PATCH] change logrotate to move instead of copytruncate

---
 squid.logrotate | 27 +++++----------------------
 squid.spec      |  5 ++++-
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/squid.logrotate b/squid.logrotate
index be3f30f..598f544 100644
--- a/squid.logrotate
+++ b/squid.logrotate
@@ -1,31 +1,14 @@
-/var/log/squid/access.log {
+/var/log/squid/access.log /var/log/squid/store.log /var/log/squid/cache.log {
     weekly
     rotate 5
-    copytruncate
     compress
     notifempty
     missingok
-}
-/var/log/squid/cache.log {
-    weekly
-    rotate 5
-    copytruncate
-    compress
-    notifempty
-    missingok
-}
-
-/var/log/squid/store.log {
-    weekly
-    rotate 5
-    copytruncate
-    compress
-    notifempty
-    missingok
-# This script asks squid to rotate its logs on its own.
-# Restarting squid is a long process and it is not worth
-# doing it just to rotate logs
+    sharedscripts
     postrotate
+      # Asks squid to reopen its logs. (log_rotate 0 is set in squid.conf)
       /usr/sbin/squid -k rotate
+      # Wait a little to allow Squid to catch up before the logs is compressed
+      sleep 1
     endscript
 }
diff --git a/squid.spec b/squid.spec
index ca2a8df..3270ba0 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE7
-Release:  3%{?dist}
+Release:  4%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -339,6 +339,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Thu Oct 09 2008 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE7-4
+- change logrotate to move instead of copytruncate
+
 * Wed Oct 08 2008 Jiri Skala <jskala@redhat.com> - 7:3.0.STABLE7-3
 - fix #465052 -  FTBFS squid-3.0.STABLE7-1.fc10