[Pkg-ceph-commits] [ceph] 01/01: d/ceph-base.*, d/*.logrotate: Install logrotate configuration in ceph-common, ensuring that all daemons get log rotation on log files, deal with removal of logrotate configuration in ceph-base for upgrades (LP: #1609866).

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu/zesty
in repository ceph.

commit 64370f78798c1184ab1c11cfe401b4421633bb4f
Author: James Page <james.page at ubuntu.com>
Date:   Wed Nov 30 15:29:41 2016 +0000

    d/ceph-base.*,d/*.logrotate: Install logrotate configuration in ceph-common, ensuring that all daemons get log rotation on log files, deal with removal of logrotate configuration in ceph-base for upgrades (LP: #1609866).
---
 debian/ceph-base.postinst                             |  3 +++
 debian/ceph-base.postrm                               |  3 +++
 debian/ceph-base.preinst                              | 10 ++++++++++
 debian/{ceph-base.logrotate => ceph-common.logrotate} |  0
 debian/changelog                                      |  4 ++++
 debian/radosgw.logrotate                              |  1 -
 6 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/ceph-base.postinst b/debian/ceph-base.postinst
index 23712a8..acd5b5f 100644
--- a/debian/ceph-base.postinst
+++ b/debian/ceph-base.postinst
@@ -53,6 +53,9 @@ case "$1" in
 	;;
 esac
 
+dpkg-maintscript-helper rm_conffile \
+    /etc/logrotate.d/ceph-base 10.2.3-0ubuntu4~ -- "$@"
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
diff --git a/debian/ceph-base.postrm b/debian/ceph-base.postrm
index 48e4853..edacc95 100644
--- a/debian/ceph-base.postrm
+++ b/debian/ceph-base.postrm
@@ -37,6 +37,9 @@ case "$1" in
     ;;
 esac
 
+dpkg-maintscript-helper rm_conffile \
+    /etc/logrotate.d/ceph-base 10.2.3-0ubuntu4~ -- "$@"
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
diff --git a/debian/ceph-base.preinst b/debian/ceph-base.preinst
new file mode 100644
index 0000000..bda9852
--- /dev/null
+++ b/debian/ceph-base.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile \
+    /etc/logrotate.d/ceph-base 10.2.3-0ubuntu4~ -- "$@"
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/ceph-base.logrotate b/debian/ceph-common.logrotate
similarity index 100%
rename from debian/ceph-base.logrotate
rename to debian/ceph-common.logrotate
diff --git a/debian/changelog b/debian/changelog
index d1791f0..202185e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ ceph (10.2.3-0ubuntu4) UNRELEASED; urgency=medium
   * d/ceph.{postinst,preinst,postrm}: Ensure that ceph logrotate
     configuration is purged on upgrade from pre-yakkety installs
     (LP: #1635844).
+  * d/ceph-base.*,d/*.logrotate: Install logrotate configuration
+    in ceph-common, ensuring that all daemons get log rotation on
+    log files, deal with removal of logrotate configuration in
+    ceph-base for upgrades (LP: #1609866).
 
  -- James Page <james.page at ubuntu.com>  Tue, 15 Nov 2016 13:40:37 +0000
 
diff --git a/debian/radosgw.logrotate b/debian/radosgw.logrotate
deleted file mode 120000
index 6790479..0000000
--- a/debian/radosgw.logrotate
+++ /dev/null
@@ -1 +0,0 @@
-../src/rgw/logrotate.conf
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git