From: Fabian Grünbichler Date: Wed, 7 Jun 2017 08:19:37 +0000 (+0200) Subject: update logrotate fix X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=a9dcff0a330a734565a4a69eaca3a0e6335ea216;p=ceph.git update logrotate fix --- diff --git a/patches/0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch b/patches/0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch deleted file mode 100644 index de0bfb1f0..000000000 --- a/patches/0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 00eebc3db3243ddf52063b58666947e0301ed3e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= -Date: Tue, 6 Jun 2017 12:20:06 +0200 -Subject: [PATCH 7/7] ceph-common: fix logrotate on upgrade from Debian -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Fabian Grünbichler ---- - debian/ceph-common.postinst | 2 ++ - debian/ceph-common.postrm | 2 ++ - debian/ceph-common.preinst | 5 +++++ - 3 files changed, 9 insertions(+) - create mode 100755 debian/ceph-common.preinst - -diff --git a/debian/ceph-common.postinst b/debian/ceph-common.postinst -index 719dc79..a431b9a 100644 ---- a/debian/ceph-common.postinst -+++ b/debian/ceph-common.postinst -@@ -99,6 +99,8 @@ case "$1" in - ;; - esac - -+dpkg-maintscript-helper rm_conffile /etc/logrotate.d/ceph-common -- "$@" -+ - # dh_installdeb will replace this with shell code automatically - # generated by other debhelper scripts. - -diff --git a/debian/ceph-common.postrm b/debian/ceph-common.postrm -index b621854..63cfe4f 100644 ---- a/debian/ceph-common.postrm -+++ b/debian/ceph-common.postrm -@@ -37,6 +37,8 @@ case "$1" in - ;; - esac - -+dpkg-maintscript-helper rm_conffile /etc/logrotate.d/ceph-common -- "$@" -+ - # dh_installdeb will replace this with shell code automatically - # generated by other debhelper scripts. - -diff --git a/debian/ceph-common.preinst b/debian/ceph-common.preinst -new file mode 100755 -index 0000000..3bc000e ---- /dev/null -+++ b/debian/ceph-common.preinst -@@ -0,0 +1,5 @@ -+#!/bin/sh -+ -+set -e -+ -+dpkg-maintscript-helper rm_conffile /etc/logrotate.d/ceph-common -- "$@" --- -2.1.4 - diff --git a/patches/0007-debian-sync-logrotate-packaging-with-downstream.patch b/patches/0007-debian-sync-logrotate-packaging-with-downstream.patch new file mode 100644 index 000000000..cce56108f --- /dev/null +++ b/patches/0007-debian-sync-logrotate-packaging-with-downstream.patch @@ -0,0 +1,48 @@ +From 1e190c864e37ea2e76a0d41f10576186697d6521 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= +Date: Tue, 6 Jun 2017 12:20:06 +0200 +Subject: [PATCH 7/7] debian: sync logrotate packaging with downstream +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +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. + +Signed-off-by: Fabian Grünbichler +--- + debian/ceph-base.maintscript | 1 + + debian/rules | 4 ++-- + 2 files changed, 3 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 0000000000..13c9f25adb +--- /dev/null ++++ b/debian/ceph-base.maintscript +@@ -0,0 +1 @@ ++rm_conffile /etc/logrotate.d/ceph.logrotate -- "$@" +diff --git a/debian/rules b/debian/rules +index e12913c6d7..aeb826b33e 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -52,8 +52,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.11.0 + diff --git a/patches/series b/patches/series index e98bac707..e5bf7f5bd 100644 --- a/patches/series +++ b/patches/series @@ -4,4 +4,4 @@ 0004-enable-systemd-targets-by-default.patch 0005-ceph-mgr-fix-package-description.patch 0006-ceph-mgr-don-t-load-broken-rest-module-by-default.patch -0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch +0007-debian-sync-logrotate-packaging-with-downstream.patch