From: Fabian Grünbichler Date: Tue, 6 Jun 2017 10:20:06 +0000 (+0200) Subject: debian: sync logrotate packaging with downstream X-Git-Tag: v12.1.0~210^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ce28c406ae04f14acb92f3c6ae90a2af29c04f1;p=ceph.git debian: sync logrotate packaging with downstream 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 --- diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript new file mode 100644 index 000000000000..38e36d454f87 --- /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 200b6dbfd8d6..d4b3c97f719c 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