Skip to content

Commit 8d95149

Browse files
Creates rabbitmq user with a default shell and uses correct arguments to the os x su command
1 parent 4cb58da commit 8d95149

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

packaging/macports/net/rabbitmq-server/Portfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
PortSystem 1.0
55
name rabbitmq-server
6-
version 1.5.5
6+
version 1.5.3
77
revision 0
88
categories net
99
maintainers [email protected]
@@ -52,7 +52,7 @@ destroot.keepdirs \
5252

5353
pre-destroot {
5454
addgroup ${servergroup}
55-
adduser ${serveruser} gid=[existsgroup ${servergroup}] realname=RabbitMQ\ Server home=${serverhome}
55+
adduser ${serveruser} gid=[existsgroup ${servergroup}] realname=RabbitMQ\ Server home=${serverhome} shell=/bin/bash
5656
}
5757

5858
post-destroot {

packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cd /var/lib/rabbitmq
1414
SCRIPT=`basename $0`
1515

1616
if [ `id -u` = 0 ] ; then
17-
su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
17+
su rabbitmq -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
1818
else
1919
/usr/lib/rabbitmq/bin/${SCRIPT}
2020
echo -e "\nOnly root should run ${SCRIPT}\n"

0 commit comments

Comments
 (0)