[arch-commits] Commit in rabbitmq/trunk (PKGBUILD rabbitmq.install)

[Levente Polyak]

    Date: Saturday, January 9, 2016 @ 21:06:05
  Author: anthraxx
Revision: 155808

upgpkg: rabbitmq 3.6.0-2

- fixes FS#47246
- remove obsolete mode fix

Modified:
  rabbitmq/trunk/PKGBUILD
  rabbitmq/trunk/rabbitmq.install

------------------+
 PKGBUILD         |    2 +-
 rabbitmq.install |   11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-09 18:08:37 UTC (rev 155807)
+++ PKGBUILD	2016-01-09 20:06:05 UTC (rev 155808)
@@ -9,7 +9,7 @@
 
 pkgname=rabbitmq
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Highly reliable and performant enterprise messaging implementation of AMQP written in Erlang/OTP"
 url="https://rabbitmq.com"
 arch=('any')

Modified: rabbitmq.install
===================================================================
--- rabbitmq.install	2016-01-09 18:08:37 UTC (rev 155807)
+++ rabbitmq.install	2016-01-09 20:06:05 UTC (rev 155808)
@@ -5,21 +5,12 @@
     passwd -l rabbitmq &>/dev/null
   fi
 
-  sed -e "/NODENAME/s/rabbit/rabbit@$(hostname)/" -i /etc/rabbitmq/rabbitmq-env.conf
+  sed -e "/NODENAME/s/rabbit/rabbit@$(hostname -s)/" -i /etc/rabbitmq/rabbitmq-env.conf
   post_upgrade
 }
 
-pre_upgrade() {
-  # tmp: fixing old installations
-  chmod 750 /var/log/rabbitmq /var/lib/rabbitmq
-}
-
 post_upgrade() {
   chown -R rabbitmq:rabbitmq /var/log/rabbitmq
   chown -R rabbitmq:rabbitmq /var/lib/rabbitmq
   chown -R rabbitmq:root /etc/rabbitmq
 }
-
-pre_remove() {
-  systemctl stop rabbitmq
-}