From f552153c72cf4341c49584fc698b275440252821 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 21 Apr 2015 16:08:09 -0700 Subject: [PATCH] logrotate.conf: prefer service over invoke-rc.d On trusty 14.04, service works but invoke-rc.d does not (but is present). Fixes: #11330 Reported-by: Wim Heirman Signed-off-by: Sage Weil (cherry picked from commit 6063a21f9edbbf80e44d45ff52a9f4ba1a1cb2c9) --- src/logrotate.conf | 6 +++--- src/rgw/logrotate.conf | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/logrotate.conf b/src/logrotate.conf index 1833d55cfd73f..9ae27baee45e1 100644 --- a/src/logrotate.conf +++ b/src/logrotate.conf @@ -4,10 +4,10 @@ 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 + if which service > /dev/null 2>&1 && [ -x `which service` ]; then service ceph reload >/dev/null + elif which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then + invoke-rc.d 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 diff --git a/src/rgw/logrotate.conf b/src/rgw/logrotate.conf index 7e527e852d7f3..6cdfd13c251fb 100644 --- a/src/rgw/logrotate.conf +++ b/src/rgw/logrotate.conf @@ -4,10 +4,10 @@ compress sharedscripts postrotate - if which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then - invoke-rc.d radosgw reload >/dev/null - elif which service > /dev/null 2>&1 && [ -x `which service` ]; then + 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 -- 2.39.5