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 | a5693ce05e62e7e9898651ed033c55b27adbbf63 (patch) | |
| tree | cb2fecf8bc8eab80b80eed46b885f213a9ed5678 | |
| parent | f7f36ed49929d1c23a6e9e49db27f380d253c73a (diff) | |
| download | rabbitmq-server-a5693ce05e62e7e9898651ed033c55b27adbbf63.tar.gz | |
Move SERVER_ERL_ARGS to rabbitmq-env and renamed rabbitmq-sys-defaults to rabbitmq-defaults
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | packaging/generic-unix/Makefile | 4 | ||||
| -rw-r--r-- | packaging/generic-unix/rabbitmq-defaults (renamed from packaging/generic-unix/rabbitmq-sys-defaults) | 4 | ||||
| -rw-r--r-- | packaging/macports/Portfile.in | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-defaults (renamed from scripts/rabbitmq-sys-defaults) | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 8 |
6 files changed, 13 insertions, 13 deletions
@@ -316,7 +316,7 @@ install_bin: all install_dirs cp -r ebin include LICENSE* INSTALL $(TARGET_DIR) chmod 0755 scripts/* - for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-plugins rabbitmq-sys-defaults; do \ + for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-plugins rabbitmq-defaults; do \ cp scripts/$$script $(TARGET_DIR)/sbin; \ [ -e $(SBIN_DIR)/$$script ] || ln -s $(SCRIPTS_REL_PATH)/$$script $(SBIN_DIR)/$$script; \ done diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile index 50298219..d485bf6b 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 279c6495..ec1dd621 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 59e7f38c..e461e49e 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 diff --git a/scripts/rabbitmq-sys-defaults b/scripts/rabbitmq-defaults index a425f923..3930e262 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 80e34e81..19767138 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 ] && \ |