From 6ce28c406ae04f14acb92f3c6ae90a2af29c04f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 6 Jun 2017 12:20:06 +0200 Subject: [PATCH] debian: sync logrotate packaging with downstream MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit both Ubuntu and Debian put the logrotate script into ceph-common, to ensure that radosgw logs are rotated as well. to prevent duplicate logrotate scripts handling the same log files, and to minimize the delta between upstream and downstream packaging, sync this change back upstream. Fixes: http://tracker.ceph.com/issues/19938 Signed-off-by: Fabian Grünbichler --- debian/ceph-base.maintscript | 2 ++ debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 debian/ceph-base.maintscript diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript new file mode 100644 index 00000000000..38e36d454f8 --- /dev/null +++ b/debian/ceph-base.maintscript @@ -0,0 +1,2 @@ +rm_conffile /etc/logrotate.d/ceph.logrotate -- "$@" +rm_conffile /etc/logrotate.d/ceph -- "$@" diff --git a/debian/rules b/debian/rules index 200b6dbfd8d..d4b3c97f719 100755 --- a/debian/rules +++ b/debian/rules @@ -59,8 +59,8 @@ override_dh_installdocs: dh_installdocs -a --all ChangeLog override_dh_installlogrotate: - cp src/logrotate.conf debian/ceph-base.ceph.logrotate - dh_installlogrotate -pceph-base --name=ceph + cp src/logrotate.conf debian/ceph-common.logrotate + dh_installlogrotate -pceph-common override_dh_installinit: # dh_installinit is only set up to handle one upstart script -- 2.39.5