Merge v1_5 into bug20329

7 files changed, 21 insertions, 4 deletions

diff --git a/packaging/RPMS/Fedora/init.d b/packaging/RPMS/Fedora/init.d
index 9409b73cad..fef5fe3d62 100644
--- a/packaging/RPMS/Fedora/init.d
+++ b/packaging/RPMS/Fedora/init.d
@@ -16,6 +16,7 @@
 # Short-Description: Enable AMQP service provided by RabbitMQ broker
 ### END INIT INFO
 
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DAEMON=/usr/sbin/rabbitmq-multi
 NAME=rabbitmq-server
 DESC=rabbitmq-server
@@ -89,7 +90,10 @@ status_rabbitmq() {
 
 rotate_logs_rabbitmq() {
     set +e
-    $DAEMON rotate_logs ${ROTATE_SUFFIX} 2>&1
+    $DAEMON rotate_logs ${ROTATE_SUFFIX}
+    if [ $? != 0 ] ; then
+        RETVAL=1
+    fi
     set -e
 }
 
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.logrotate b/packaging/RPMS/Fedora/rabbitmq-server.logrotate
index ab87e4a5c6..6b657614de 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.logrotate
+++ b/packaging/RPMS/Fedora/rabbitmq-server.logrotate
@@ -7,6 +7,6 @@
         notifempty
         sharedscripts
         postrotate
-            /sbin/service rabbitmq-server rotate-logs
+            /sbin/service rabbitmq-server rotate-logs > /dev/null
         endscript
 }
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index c636c820ae..b9693092f1 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -60,6 +60,8 @@ install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmq-multi
 
 install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
 
+mkdir -p %{buildroot}/etc/rabbitmq
+
 rm %{_maindir}/LICENSE %{_maindir}/LICENSE-MPL-RabbitMQ %{_maindir}/INSTALL
 
 #Build the list of files
@@ -99,6 +101,9 @@ fi
 %defattr(-,root,root,-)
 %attr(0750, rabbitmq, rabbitmq) %dir /var/lib/rabbitmq
 %attr(0750, rabbitmq, rabbitmq) %dir /var/log/rabbitmq
+%dir /var/lib/rabbitmq
+%dir /var/log/rabbitmq
+%dir /etc/rabbitmq
 %{_rabbit_erllibdir}
 %{_rabbit_libdir}
 %{_initrddir}/rabbitmq-server
diff --git a/packaging/debs/Debian/debian/dirs b/packaging/debs/Debian/debian/dirs
index 1a707bc191..625b7d41f5 100644
--- a/packaging/debs/Debian/debian/dirs
+++ b/packaging/debs/Debian/debian/dirs
@@ -5,4 +5,5 @@ usr/share/man
 var/lib/rabbitmq/mnesia
 var/log/rabbitmq
 etc/logrotate.d
+etc/rabbitmq
 
diff --git a/packaging/debs/Debian/debian/init.d b/packaging/debs/Debian/debian/init.d
index 36cb922cc4..ef66add5a5 100644
--- a/packaging/debs/Debian/debian/init.d
+++ b/packaging/debs/Debian/debian/init.d
@@ -9,6 +9,7 @@
 # Short-Description: Enable AMQP service provided by RabbitMQ broker
 ### END INIT INFO
 
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DAEMON=/usr/sbin/rabbitmq-multi
 NAME=rabbitmq-server
 DESC=rabbitmq-server
@@ -78,7 +79,10 @@ status_rabbitmq() {
 
 rotate_logs_rabbitmq() {
     set +e
-    $DAEMON rotate_logs ${ROTATE_SUFFIX} 2>&1
+    $DAEMON rotate_logs ${ROTATE_SUFFIX}
+    if [ $? != 0 ] ; then
+        RETVAL=1
+    fi
     set -e
 }
 
diff --git a/packaging/debs/Debian/debian/postrm b/packaging/debs/Debian/debian/postrm
index 8d1e92a929..a999d95b29 100644
--- a/packaging/debs/Debian/debian/postrm
+++ b/packaging/debs/Debian/debian/postrm
@@ -31,6 +31,9 @@ case "$1" in
         if [ -d /var/run/rabbitmq ]; then
                 rm -r /var/run/rabbitmq
         fi
+        if [ -d /etc/rabbitmq ]; then
+                rm -r /etc/rabbitmq
+        fi
         if getent passwd rabbitmq >/dev/null; then
                 deluser rabbitmq
         fi
diff --git a/packaging/debs/Debian/debian/rabbitmq-server.logrotate b/packaging/debs/Debian/debian/rabbitmq-server.logrotate
index bfd6b8da0b..c786df77b2 100644
--- a/packaging/debs/Debian/debian/rabbitmq-server.logrotate
+++ b/packaging/debs/Debian/debian/rabbitmq-server.logrotate
@@ -7,6 +7,6 @@
         notifempty
         sharedscripts
         postrotate
-            /etc/init.d/rabbitmq-server rotate-logs
+            /etc/init.d/rabbitmq-server rotate-logs > /dev/null
         endscript
 }