summaryrefslogtreecommitdiff
path: root/net/rabbitmq/files
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2011-08-10 19:00:33 +0000
committerSteve Wills <swills@FreeBSD.org>2011-08-10 19:00:33 +0000
commit3e537067237e4bbca29dcee89bf89fb4dd5f6bb5 (patch)
treeb43acf6d82b164a68ce9f25b3817401425a72226 /net/rabbitmq/files
parent- Fix/add usage of SQLITE3_CFLAGS and SQLITE3_LIBS as detected by pkg-config (diff)
- Update to 2.5.1
PR: ports/159364 Submitted by: Andrew <andrew@flarn.com> Approved by: Phillip Neumann <pneumann@gmail.com> (maintainer) (with changes)
Notes
Notes: svn path=/head/; revision=279442
Diffstat (limited to 'net/rabbitmq/files')
-rw-r--r--net/rabbitmq/files/patch-rabbitmqctl8
-rw-r--r--net/rabbitmq/files/patch-src-rabbit_networking-erl13
-rw-r--r--net/rabbitmq/files/rabbitmq.in14
3 files changed, 11 insertions, 24 deletions
diff --git a/net/rabbitmq/files/patch-rabbitmqctl b/net/rabbitmq/files/patch-rabbitmqctl
index 29b9d4089314..be97f57bb23f 100644
--- a/net/rabbitmq/files/patch-rabbitmqctl
+++ b/net/rabbitmq/files/patch-rabbitmqctl
@@ -1,11 +1,11 @@
---- scripts/rabbitmqctl.orig 2011-01-12 09:22:10.000000000 -0300
-+++ scripts/rabbitmqctl 2011-01-12 09:23:31.000000000 -0300
-@@ -38,7 +38,7 @@
+--- scripts/rabbitmqctl.orig 2011-08-01 15:59:26.057347310 +0100
++++ scripts/rabbitmqctl 2011-08-01 16:00:07.303513263 +0100
+@@ -20,7 +20,7 @@
[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
[ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
-exec erl \
-+sudo -u rabbitmq HOME=/var/db/rabbitmq erl \
++HOME=/var/db/rabbitmq exec erl \
-pa "${RABBITMQ_HOME}/ebin" \
-noinput \
-hidden \
diff --git a/net/rabbitmq/files/patch-src-rabbit_networking-erl b/net/rabbitmq/files/patch-src-rabbit_networking-erl
deleted file mode 100644
index 12040aec5f4c..000000000000
--- a/net/rabbitmq/files/patch-src-rabbit_networking-erl
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/rabbit_networking.erl.orig 2011-02-03 14:47:35.000000000 +0200
-+++ src/rabbit_networking.erl 2011-05-30 13:51:28.000000000 +0200
-@@ -52,6 +52,9 @@
-
- -export_type([ip_port/0, hostname/0]).
-
-+-type(hostname() :: inet:hostname()).
-+-type(ip_port() :: inet:ip_port()).
-+
- -type(family() :: atom()).
- -type(listener_config() :: ip_port() |
- {hostname(), ip_port()} |
-
diff --git a/net/rabbitmq/files/rabbitmq.in b/net/rabbitmq/files/rabbitmq.in
index b13d9d4ebb7b..7b69526427f8 100644
--- a/net/rabbitmq/files/rabbitmq.in
+++ b/net/rabbitmq/files/rabbitmq.in
@@ -8,7 +8,7 @@
# BEFORE: LOGIN
# KEYWORD: shutdown
#
-# Add the following line to /etc/rc.conf to enable RabitMQ
+# Add the following line to /etc/rc.conf to enable RabbitMQ
#
# rabbitmq_enable="YES"
@@ -20,13 +20,13 @@ rcvar=`set_rcvar`
# Set some defaults
rabbitmq_enable=${rabbitmq_enable:-"NO"}
rabbitmq_user=${rabbitmq_user:-"rabbitmq"}
-rabbitmq_nodes=${rabbitmq_nodes:-"1"}
-rabbitmq_multi="%%PREFIX%%/sbin/rabbitmq-multi"
+rabbitmq_server="%%PREFIX%%/sbin/rabbitmq-server"
+rabbitmq_ctl="%%PREFIX%%/sbin/rabbitmqctl"
-start_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} start_all ${rabbitmq_nodes}\"'"
-stop_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} stop_all\"'"
-rotate_logs_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} rotate_logs\"'"
-status_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} status\"'"
+start_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_server} -detached\"'"
+stop_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} stop\"'"
+rotate_logs_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} rotate_logs\"'"
+status_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} status\"'"
extra_commands="rotate_logs status"
load_rc_config $name