summaryrefslogtreecommitdiff
path: root/packaging/common
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-10-10 09:51:56 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-10-10 09:51:56 +0100
commitfe15c3ac5d5186506702c46b0f0cb2e8dcbb2530 (patch)
treebbbfe073cb6cf492c4faa654ce21d71f57dfefe0 /packaging/common
parentf88351e1078750fcfc5f8b8a66bda5a3b1aece12 (diff)
parent6c358592c74a2da74a84920a4eec57f8b99a162a (diff)
downloadrabbitmq-server-git-fe15c3ac5d5186506702c46b0f0cb2e8dcbb2530.tar.gz
merge default into bug21319
Diffstat (limited to 'packaging/common')
-rw-r--r--packaging/common/LICENSE14
-rw-r--r--packaging/common/rabbitmq-script-wrapper6
2 files changed, 17 insertions, 3 deletions
diff --git a/packaging/common/LICENSE b/packaging/common/LICENSE
new file mode 100644
index 0000000000..f8039d6a01
--- /dev/null
+++ b/packaging/common/LICENSE
@@ -0,0 +1,14 @@
+This package, the RabbitMQ server is licensed under the MPL. For the
+MPL, please see LICENSE-MPL-RabbitMQ.
+
+This package makes use of the following third party libraries:
+jQuery - http://jquery.com/ - MIT license, see LICENSE-MIT-jQuery142
+EJS - http://embeddedjs.com/ - MIT license, see LICENSE-MIT-EJS10
+Sammy - http://code.quirkey.com/sammy/ - MIT license, see LICENSE-MIT-Sammy060
+webmachine - http://webmachine.basho.com/ - Apache license, 2.0, LICENSE-Apache-Basho
+mochiweb - http://github.com/mochi/mochiweb/ - MIT license, see LICENSE-MIT-Mochi
+glMatrix - http://code.google.com/p/glmatrix/ - BSD 2-clause license, see LICENSE-BSD-glMatrix
+eldap - https://github.com/etnt/eldap - MIT license, see LICENSE-MIT-eldap
+
+If you have any questions regarding licensing, please contact us at
+info@rabbitmq.com.
diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper
index 23d2a06cbd..0436f54609 100644
--- a/packaging/common/rabbitmq-script-wrapper
+++ b/packaging/common/rabbitmq-script-wrapper
@@ -29,10 +29,10 @@ cd /var/lib/rabbitmq
SCRIPT=`basename $0`
-if [ `id -u` = 0 ] ; then
- @SU_RABBITMQ_SH_C@ "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
-elif [ `id -u` = `id -u rabbitmq` ] ; then
+if [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then
/usr/lib/rabbitmq/bin/${SCRIPT} "$@"
+elif [ `id -u` = 0 ] ; then
+ @SU_RABBITMQ_SH_C@ "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
else
/usr/lib/rabbitmq/bin/${SCRIPT}
echo