fix logrotate script wrt #490672

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

5 files changed, 47 insertions, 9 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 8a72a031703d..03dda1868f68 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.52 2014/01/31 13:23:02 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.53 2014/02/14 14:06:11 ultrabug Exp $
+
+  14 Feb 2014; Ultrabug <ultrabug@gentoo.org> glusterfs-3.4.0-r1.ebuild,
+  glusterfs-3.4.1.ebuild, glusterfs-3.4.2.ebuild, +files/glusterfs.logrotate:
+  fix 3.4.x logrotate script #490672 thx to Christian Affolter
 
 *glusterfs-3.4.2 (31 Jan 2014)
 
diff --git a/sys-cluster/glusterfs/files/glusterfs.logrotate b/sys-cluster/glusterfs/files/glusterfs.logrotate
new file mode 100644
index 000000000000..07ae7b9e54dc
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs.logrotate
@@ -0,0 +1,34 @@
+# Rotate client logs
+/var/log/glusterfs/*.log {
+  weekly
+  rotate 52
+  missingok
+
+  # compress the logs, but from the .2 onwards
+  compress
+  delaycompress
+  notifempty
+
+  sharedscripts
+  postrotate
+  /usr/bin/killall -HUP glusterfs > /dev/null 2>&1 || true
+  /usr/bin/killall -HUP glusterd > /dev/null 2>&1 || true
+  endscript
+}
+
+# Rotate server logs
+/var/log/glusterfs/bricks/*.log {
+  weekly
+  rotate 52
+  missingok
+
+  # compress the logs, but from the .2 onwards
+  compress
+  delaycompress
+  notifempty
+
+  sharedscripts
+  postrotate
+  /usr/bin/killall -HUP glusterfsd > /dev/null 2>&1 || true
+  endscript
+}
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
index 8e26e8e1e2bd..805f664661b1 100644
--- a/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild,v 1.3 2013/10/16 12:20:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild,v 1.4 2014/02/14 14:06:11 ultrabug Exp $
 
 EAPI=5
 
@@ -87,7 +87,7 @@ src_install() {
 
 	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
 	insinto /etc/logrotate.d
-	newins extras/glusterfs-logrotate glusterfs
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
 
 	if use emacs ; then
 		elisp-install ${PN} extras/glusterfs-mode.el*
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild
index c01b4f30f35c..97e4670c7816 100644
--- a/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild,v 1.1 2013/12/31 09:04:47 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild,v 1.2 2014/02/14 14:06:11 ultrabug Exp $
 
 EAPI=5
 
@@ -84,7 +84,7 @@ src_install() {
 
 	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
 	insinto /etc/logrotate.d
-	newins extras/glusterfs-logrotate glusterfs
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
 
 	if use emacs ; then
 		elisp-install ${PN} extras/glusterfs-mode.el*
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild
index 110b65efae7f..4dbfabbeb5ad 100644
--- a/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild,v 1.1 2014/01/31 13:23:02 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild,v 1.2 2014/02/14 14:06:11 ultrabug Exp $
 
 EAPI=5
 
@@ -84,7 +84,7 @@ src_install() {
 
 	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
 	insinto /etc/logrotate.d
-	newins extras/glusterfs-logrotate glusterfs
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
 
 	if use emacs ; then
 		elisp-install ${PN} extras/glusterfs-mode.el*