- BR: boost-python-devel

[packages/ceph.git] / ceph.logrotate.patch

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 2a3bb24df6bd60d74c2fa4e1970d3e039a71fb2b..cdae0e6f791504123aec956952e2a5a3c10104d1 100644 (file)
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,29 +1,12 @@
---- ceph-0.78/src/logrotate.conf.orig  2014-04-03 18:19:47.067725657 +0200
-+++ ceph-0.78/src/logrotate.conf       2014-04-03 18:26:09.521051018 +0200
-@@ -4,25 +4,7 @@
+--- ceph-12.2.13/src/logrotate.conf.orig       2020-05-28 06:45:00.496496556 +0200
++++ ceph-12.2.13/src/logrotate.conf    2020-05-28 06:47:07.249143211 +0200
+@@ -4,8 +4,7 @@
      compress
      sharedscripts
      postrotate
--        if which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then
--            invoke-rc.d ceph reload >/dev/null
--        elif which service > /dev/null 2>&1 && [ -x `which service` ]; then
--            service ceph 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
--            for daemon in osd mon mds ; do
--              find -L /var/lib/ceph/$daemon/ -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/$daemon/$f/done" ] && [ -e "/var/lib/ceph/$daemon/$f/upstart" ] && [ ! -e "/var/lib/ceph/$daemon/$f/sysvinit" ]; then
--                      cluster="${f%%-*}"
--                      id="${f#*-}"
--
--                      initctl reload ceph-$daemon cluster="$cluster" id="$id" 2>/dev/null || :
--                    fi
--                  done
--            done
--        fi
-+        service ceph reload >/dev/null 2>/dev/null
+-        killall -q -1 ceph-mon ceph-mgr ceph-mds ceph-osd ceph-fuse radosgw || true
+-        killall -q -1 ceph-mon ceph-mgr ceph-mds ceph-osd ceph-fuse radosgw rbd-mirror || true
++        cephctl reload >/dev/null 2>/dev/null
      endscript
      missingok
- }
+     notifempty