summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorSteve Powell <steve@rabbitmq.com>2012-02-28 10:56:15 +0000
committerSteve Powell <steve@rabbitmq.com>2012-02-28 10:56:15 +0000
commit2bbd4c6060944433ebe4ca87d2823e9cce1147ac (patch)
treecb2fecf8bc8eab80b80eed46b885f213a9ed5678 /packaging
parentb35c92000e9e26429312c9a2b0209dd34b3761d6 (diff)
downloadrabbitmq-server-git-2bbd4c6060944433ebe4ca87d2823e9cce1147ac.tar.gz
Move SERVER_ERL_ARGS to rabbitmq-env and renamed rabbitmq-sys-defaults to rabbitmq-defaults
Diffstat (limited to 'packaging')
-rw-r--r--packaging/generic-unix/Makefile4
-rw-r--r--packaging/generic-unix/rabbitmq-defaults (renamed from packaging/generic-unix/rabbitmq-sys-defaults)4
-rw-r--r--packaging/macports/Portfile.in4
3 files changed, 5 insertions, 7 deletions
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile
index 502982197e..d485bf6ba2 100644
--- a/packaging/generic-unix/Makefile
+++ b/packaging/generic-unix/Makefile
@@ -12,8 +12,8 @@ dist:
MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \
install
- cp -f rabbitmq-sys-defaults $(TARGET_DIR)/sbin
- chmod 0755 $(TARGET_DIR)/sbin/rabbitmq-sys-defaults
+ cp -f rabbitmq-defaults $(TARGET_DIR)/sbin
+ chmod 0755 $(TARGET_DIR)/sbin/rabbitmq-defaults
mkdir -p $(TARGET_DIR)/etc/rabbitmq
diff --git a/packaging/generic-unix/rabbitmq-sys-defaults b/packaging/generic-unix/rabbitmq-defaults
index 279c649506..ec1dd621e4 100644
--- a/packaging/generic-unix/rabbitmq-sys-defaults
+++ b/packaging/generic-unix/rabbitmq-defaults
@@ -26,9 +26,7 @@ check_and_set_rabbitmq_file_location() {
eval "$1=${SYS_PREFIX}$2"
}
-## Set system default values
-SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
--kernel inet_default_connect_options [{nodelay,true}]"
+## Set default values
check_and_set_rabbitmq_file_location CONF_ENV_FILE /etc/rabbitmq/rabbitmq-env.conf
check_and_set_rabbitmq_file_location CONFIG_FILE /etc/rabbitmq/rabbitmq .config
diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index 59e7f38c54..e461e49eca 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -91,9 +91,9 @@ post-destroot {
xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
reinplace -E "s:^SYS_PREFIX=\${RABBITMQ_HOME}$:SYS_PREFIX=${prefix}:" \
- ${realsbin}/rabbitmq-sys-defaults
+ ${realsbin}/rabbitmq-defaults
reinplace -E "s:^SYS_PREFIX=$:SYS_PREFIX=${prefix}:" \
- ${realsbin}/rabbitmq-sys-defaults
+ ${realsbin}/rabbitmq-defaults
xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
${wrappersbin}/rabbitmq-server