summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
Diffstat (limited to 'packaging')
-rwxr-xr-x[-rw-r--r--]packaging/RPMS/Fedora/rabbitmq-server.init3
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.logrotate5
-rwxr-xr-x[-rw-r--r--]packaging/debs/Debian/debian/rabbitmq-server.init3
-rw-r--r--packaging/debs/Debian/debian/rabbitmq-server.logrotate5
4 files changed, 2 insertions, 14 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.init b/packaging/RPMS/Fedora/rabbitmq-server.init
index 15929108b5..90b48499fc 100644..100755
--- a/packaging/RPMS/Fedora/rabbitmq-server.init
+++ b/packaging/RPMS/Fedora/rabbitmq-server.init
@@ -24,7 +24,6 @@ DAEMON=/usr/sbin/${NAME}
CONTROL=/usr/sbin/rabbitmqctl
DESC=rabbitmq-server
USER=rabbitmq
-ROTATE_SUFFIX=
PID_FILE=/var/run/rabbitmq/pid
RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env
@@ -125,7 +124,7 @@ status_rabbitmq() {
rotate_logs_rabbitmq() {
set +e
- $CONTROL rotate_logs ${ROTATE_SUFFIX}
+ $CONTROL rotate_logs
if [ $? != 0 ] ; then
RETVAL=1
fi
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.logrotate b/packaging/RPMS/Fedora/rabbitmq-server.logrotate
index 6b657614de..21a9fc0b84 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.logrotate
+++ b/packaging/RPMS/Fedora/rabbitmq-server.logrotate
@@ -3,10 +3,5 @@
missingok
rotate 20
compress
- delaycompress
notifempty
- sharedscripts
- postrotate
- /sbin/service rabbitmq-server rotate-logs > /dev/null
- endscript
}
diff --git a/packaging/debs/Debian/debian/rabbitmq-server.init b/packaging/debs/Debian/debian/rabbitmq-server.init
index fce2d16401..f8801d9864 100644..100755
--- a/packaging/debs/Debian/debian/rabbitmq-server.init
+++ b/packaging/debs/Debian/debian/rabbitmq-server.init
@@ -22,7 +22,6 @@ DAEMON=/usr/sbin/${NAME}
CONTROL=/usr/sbin/rabbitmqctl
DESC="message broker"
USER=rabbitmq
-ROTATE_SUFFIX=
PID_FILE=/var/run/rabbitmq/pid
RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env
@@ -106,7 +105,7 @@ status_rabbitmq() {
rotate_logs_rabbitmq() {
set +e
- $CONTROL -q rotate_logs ${ROTATE_SUFFIX}
+ $CONTROL -q rotate_logs
if [ $? != 0 ] ; then
RETVAL=1
fi
diff --git a/packaging/debs/Debian/debian/rabbitmq-server.logrotate b/packaging/debs/Debian/debian/rabbitmq-server.logrotate
index c786df77b2..21a9fc0b84 100644
--- a/packaging/debs/Debian/debian/rabbitmq-server.logrotate
+++ b/packaging/debs/Debian/debian/rabbitmq-server.logrotate
@@ -3,10 +3,5 @@
missingok
rotate 20
compress
- delaycompress
notifempty
- sharedscripts
- postrotate
- /etc/init.d/rabbitmq-server rotate-logs > /dev/null
- endscript
}