From: Oleksiy Molchanov <omolchanov@mirantis.com>
Date: Sun, 15 Jul 2018 20:20:45 +0000 (+0300)
Subject: Update logrotate script for radosgw
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fheads%2F9.0;p=packages%2Ftrusty%2Fceph.git

Update logrotate script for radosgw

Remove 'service ceph-radosgw reload' because of its absence

Change-Id: Ic3c8de446be6825a8196683bfcc9c5719b716b8f
---

diff --git a/ceph/src/rgw/logrotate.conf b/ceph/src/rgw/logrotate.conf
index 6cdfd13c..f5c0ef03 100644
--- a/ceph/src/rgw/logrotate.conf
+++ b/ceph/src/rgw/logrotate.conf
@@ -4,22 +4,7 @@
     compress
     sharedscripts
     postrotate
-        if which service > /dev/null 2>&1 && [ -x `which service` ]; then
-            service ceph-radosgw reload >/dev/null
-        elif which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then
-            invoke-rc.d radosgw reload >/dev/null
-        fi
-        # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op
-        if which initctl > /dev/null 2>&1 && [ -x `which initctl` ]; then
-          find -L /var/lib/ceph/radosgw/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \
-          | while read f; do
-            if [ -e "/var/lib/ceph/radosgw/$f/done" ]; then
-                cluster="${f%%-*}"
-                id="${f#*-}"
-                initctl reload radosgw cluster="$cluster" id="$id" 2>/dev/null || :
-            fi
-          done
-        fi
+      invoke-rc.d radosgw reload >/dev/null
     endscript
     missingok
     notifempty
diff --git a/debian/changelog b/debian/changelog
index 47d4c141..a84b2463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.94.9-1~u14.04+mos4) mos9.0; urgency=medium
+
+  * Fix logrotate for radosgw
+
+ -- Oleksiy Molchanov <omolchanov@mirantis.com>  Mon, 16 Jul 2018 12:40:15 +0300
+
 ceph (0.94.9-1~u14.04+mos3) mos9.0; urgency=medium
 
   * CVE-2016-7031