[Pkg-ceph-commits] [ceph] 04/04: Move logrotate configuration to ceph-common package

[James Downing Page]

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

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

commit 36a330eb212251e366d3d4091459c537674d46f6
Author: James Page <james.page at ubuntu.com>
Date:   Tue Jan 17 15:03:02 2017 +0000

    Move logrotate configuration to ceph-common package
    
    Drop radosgw.logrotate in preference to common version.
    
    Ensure logrotate from ceph package is removed on upgrade.
---
 debian/{ceph.logrotate => ceph-common.logrotate} |  0
 debian/ceph.postinst                             |  3 +++
 debian/ceph.postrm                               |  3 +++
 debian/ceph.preinst                              | 10 ++++++++++
 debian/changelog                                 |  4 ++++
 debian/radosgw.logrotate                         |  1 -
 6 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/ceph.logrotate b/debian/ceph-common.logrotate
similarity index 100%
rename from debian/ceph.logrotate
rename to debian/ceph-common.logrotate
diff --git a/debian/ceph.postinst b/debian/ceph.postinst
index b280af9..a396607 100644
--- a/debian/ceph.postinst
+++ b/debian/ceph.postinst
@@ -61,6 +61,9 @@ case "$1" in
 	;;
 esac
 
+dpkg-maintscript-helper rm_conffile \
+       /etc/logrotate.d/ceph 10.2.5-0ubuntu0.16.04.1~ -- "$@"
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
diff --git a/debian/ceph.postrm b/debian/ceph.postrm
index 48e4853..d4371d8 100644
--- a/debian/ceph.postrm
+++ b/debian/ceph.postrm
@@ -37,6 +37,9 @@ case "$1" in
     ;;
 esac
 
+dpkg-maintscript-helper rm_conffile \
+       /etc/logrotate.d/ceph 10.2.5-0ubuntu0.16.04.1~ -- "$@"
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
diff --git a/debian/ceph.preinst b/debian/ceph.preinst
new file mode 100644
index 0000000..5a94ca2
--- /dev/null
+++ b/debian/ceph.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile \
+       /etc/logrotate.d/ceph 10.2.5-0ubuntu0.16.04.1~ -- "$@"
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/changelog b/debian/changelog
index 1377019..aa9941f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ ceph (10.2.5-0ubuntu0.16.04.1) xenial; urgency=medium
   * d/rules: Install upstream provided systemd targets and ensure they
     are enabled and started on install to ensure that integrations aligned
     to upstream packaging work with Ubuntu packages (LP: #1646583).
+  * d/ceph.*,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 for upgrades (LP: #1609866).
 
  -- James Page <james.page at ubuntu.com>  Wed, 14 Dec 2016 11:42:36 +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