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

[Levente Polyak]

    Date: Monday, November 28, 2016 @ 14:33:54
  Author: anthraxx
Revision: 197151

upgpkg: rabbitmq 3.6.6-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-28 14:32:39 UTC (rev 197150)
+++ PKGBUILD	2016-11-28 14:33:54 UTC (rev 197151)
@@ -8,19 +8,20 @@
 # Contributor: mutantmonkey
 
 pkgname=rabbitmq
-pkgver=3.6.5
+pkgver=3.6.6
 pkgrel=1
-pkgdesc="Highly reliable and performant enterprise messaging implementation of AMQP written in Erlang/OTP"
-url="https://rabbitmq.com"
+pkgdesc='Highly reliable and performant enterprise messaging implementation of AMQP written in Erlang/OTP'
+url='https://rabbitmq.com'
 arch=('any')
 license=('MPL')
-depends=('erlang-nox' 'systemd')
+depends=('erlang-nox')
+optdepends=('rabbitmqadmin: CLI management tool')
 backup=('etc/rabbitmq/rabbitmq-env.conf')
 install=rabbitmq.install
 source=(https://www.rabbitmq.com/releases/${pkgname}-server/v${pkgver}/${pkgname}-server-generic-unix-${pkgver}.tar.xz{,.asc}
         rabbitmq-env.conf
         rabbitmq.service)
-sha512sums=('d3f9894369ba34ffdd950258c72088928abeee4cf03e4592e08feed23b6046dafda92221e7635c4832809a1935eb334f3d2fbcd4d910ba20b47ae6dd50683141'
+sha512sums=('ed1db2aa8eafed77e888b9a18100c8647ad8fdc28ebec1659063ea2af4167c8c0d4f771ca8f29fa2f9b39de5bbaa3b469cd3c32c631f459b458da11f0f04de45'
             'SKIP'
             '4872ff514c9f841fe4c93bc442ec4e3177d1bfa3834e8d8a26fc77a63aff1cdc14944827673a59556e26210b2b4c0091f93c8e93a334710e5bc3336a64e77140'
             'd51b43f948febb23cdd5b0c7736f966d8433b05ccd95778e90d280d45ccfd9a714e888762f458337a784fff4b86430151adb0f81d779d6b99c9154fcd7e0e319')
@@ -40,10 +41,10 @@
   install -dm 750 "${pkgdir}/var/log/rabbitmq"
   install -dm 750 "${pkgdir}/var/lib/rabbitmq"
 
-  cp -R ebin ${libdir}
-  cp -R include ${libdir}
-  cp -R plugins ${libdir}
-  cp -R sbin ${libdir}
+  cp -R ebin "${libdir}"
+  cp -R include "${libdir}"
+  cp -R plugins "${libdir}"
+  cp -R sbin "${libdir}"
   cp -R share "${pkgdir}/usr"
 
   for script in ${libdir}/sbin/*; do
@@ -52,6 +53,10 @@
 
   install -Dm 644 "${srcdir}/rabbitmq-env.conf" "${pkgdir}/etc/rabbitmq/rabbitmq-env.conf"
   install -Dm 644 "${srcdir}/rabbitmq.service" "${pkgdir}/usr/lib/systemd/system/rabbitmq.service"
+
+  chown -R 197:197 "${pkgdir}/var/log/rabbitmq"
+  chown -R 197:197 "${pkgdir}/var/lib/rabbitmq"
+  chown -R 197:0 "${pkgdir}/etc/rabbitmq"
 }
 
 # vim: ts=2 sw=2 et:

Modified: rabbitmq.install
===================================================================
--- rabbitmq.install	2016-11-28 14:32:39 UTC (rev 197150)
+++ rabbitmq.install	2016-11-28 14:33:54 UTC (rev 197151)
@@ -1,16 +1,15 @@
 post_install() {
   if ! getent passwd rabbitmq &>/dev/null; then
     groupadd -r -g 197 rabbitmq &>/dev/null
-    useradd -r -u 197 -g rabbitmq -d /var/lib/rabbitmq -c 'RabbitMQ user' rabbitmq &>/dev/null
+    useradd -r -u 197 -g rabbitmq -d /var/lib/rabbitmq -s /bin/nologin -c 'RabbitMQ user' rabbitmq &>/dev/null
     passwd -l rabbitmq &>/dev/null
   fi
-
   sed -e "/NODENAME/s/rabbit/rabbit@$(hostname -s)/" -i /etc/rabbitmq/rabbitmq-env.conf
-  post_upgrade
 }
 
 post_upgrade() {
-  chown -R rabbitmq:rabbitmq /var/log/rabbitmq
-  chown -R rabbitmq:rabbitmq /var/lib/rabbitmq
-  chown -R rabbitmq:root /etc/rabbitmq
+  post_install
+  usermod -s /bin/nologin rabbitmq &>/dev/null
 }
+
+# vim: ts=2 sw=2 et: