diff options
| author | Steve Powell <steve@rabbitmq.com> | 2012-02-28 10:56:15 +0000 |
|---|---|---|
| committer | Steve Powell <steve@rabbitmq.com> | 2012-02-28 10:56:15 +0000 |
| commit | 2bbd4c6060944433ebe4ca87d2823e9cce1147ac (patch) | |
| tree | cb2fecf8bc8eab80b80eed46b885f213a9ed5678 /scripts | |
| parent | b35c92000e9e26429312c9a2b0209dd34b3761d6 (diff) | |
| download | rabbitmq-server-git-2bbd4c6060944433ebe4ca87d2823e9cce1147ac.tar.gz | |
Move SERVER_ERL_ARGS to rabbitmq-env and renamed rabbitmq-sys-defaults to rabbitmq-defaults
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-defaults (renamed from scripts/rabbitmq-sys-defaults) | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/scripts/rabbitmq-sys-defaults b/scripts/rabbitmq-defaults index a425f923d8..3930e262dc 100644 --- a/scripts/rabbitmq-sys-defaults +++ b/scripts/rabbitmq-defaults @@ -18,9 +18,7 @@ ### next line potentially updated in package install steps, do not alter SYS_PREFIX= -## Set system default values -SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ --kernel inet_default_connect_options [{nodelay,true}]" +## Set default values CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 80e34e813a..197671380c 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -36,8 +36,12 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.." [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname` NODENAME=rabbit@${HOSTNAME%%.*} -## Get system defaults -. ${SCRIPT_DIR}/rabbitmq-sys-defaults +## Set defaults +. ${SCRIPT_DIR}/rabbitmq-defaults + +## Common defaults +SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ + -kernel inet_default_connect_options [{nodelay,true}]" # warn about old rabbitmq.conf file, if no new one if [ -f /etc/rabbitmq/rabbitmq.conf ] && \ |