summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortimc@afallen.home <timc@afallen.home>2009-06-10 18:02:41 +0100
committertimc@afallen.home <timc@afallen.home>2009-06-10 18:02:41 +0100
commit8d9514935a03c30a22a406c7d477dac9991c0df5 (patch)
tree76854c99bc64ba1b8d686593dcc19aca8ea85d98
parent4cb58da79f017c80b27d9b60346cbbaef7cb8232 (diff)
downloadrabbitmq-server-git-8d9514935a03c30a22a406c7d477dac9991c0df5.tar.gz
Creates rabbitmq user with a default shell and uses correct arguments to the os x su command
-rw-r--r--packaging/macports/net/rabbitmq-server/Portfile4
-rw-r--r--packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper2
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/macports/net/rabbitmq-server/Portfile b/packaging/macports/net/rabbitmq-server/Portfile
index 805bc3fd89..0032eb5a1d 100644
--- a/packaging/macports/net/rabbitmq-server/Portfile
+++ b/packaging/macports/net/rabbitmq-server/Portfile
@@ -3,7 +3,7 @@
PortSystem 1.0
name rabbitmq-server
-version 1.5.5
+version 1.5.3
revision 0
categories net
maintainers tonyg@rabbitmq.com
@@ -52,7 +52,7 @@ destroot.keepdirs \
pre-destroot {
addgroup ${servergroup}
- adduser ${serveruser} gid=[existsgroup ${servergroup}] realname=RabbitMQ\ Server home=${serverhome}
+ adduser ${serveruser} gid=[existsgroup ${servergroup}] realname=RabbitMQ\ Server home=${serverhome} shell=/bin/bash
}
post-destroot {
diff --git a/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper b/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
index 296a77d19c..72f52a84f0 100644
--- a/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
+++ b/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
@@ -14,7 +14,7 @@ cd /var/lib/rabbitmq
SCRIPT=`basename $0`
if [ `id -u` = 0 ] ; then
- su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
+ su rabbitmq -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
else
/usr/lib/rabbitmq/bin/${SCRIPT}
echo -e "\nOnly root should run ${SCRIPT}\n"