diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2009-02-20 15:13:20 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2009-02-20 15:13:20 +0000 |
| commit | 783c28fc1ff31620fa99a26280a583f9da8a9c06 (patch) | |
| tree | e2fb03b3933b107b8b17b302d568994208c8f1e9 /packaging/RPMS | |
| parent | 9c8b9d142e64b6975029f5c41421c3c4dc3022e9 (diff) | |
| parent | 71077f0a21145fbd72db936b95c5075c0910e3e6 (diff) | |
| download | rabbitmq-server-git-783c28fc1ff31620fa99a26280a583f9da8a9c06.tar.gz | |
Merge v1_5 into bug20329
Diffstat (limited to 'packaging/RPMS')
| -rw-r--r-- | packaging/RPMS/Fedora/init.d | 6 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.logrotate | 2 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 5 |
3 files changed, 11 insertions, 2 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 |