diff options
| author | Steve Powell <steve@rabbitmq.com> | 2012-01-30 18:01:45 +0000 |
|---|---|---|
| committer | Steve Powell <steve@rabbitmq.com> | 2012-01-30 18:01:45 +0000 |
| commit | 9bf32bf5a92b051f49cba5272f8c39d54036d682 (patch) | |
| tree | aeafd952d17e286a606b3e9913d248e6b58c5a99 | |
| parent | 892ab6014a50a6d911131c79969119a7cffcd75b (diff) | |
| download | rabbitmq-server-9bf32bf5a92b051f49cba5272f8c39d54036d682.tar.gz | |
Modify generic-unix packaging step to override rabbitmq-sys defaults.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | packaging/generic-unix/Makefile | 3 | ||||
| -rw-r--r-- | packaging/generic-unix/rabbitmq-sys | 32 | ||||
| -rw-r--r-- | scripts/rabbitmq-sys | 15 |
4 files changed, 43 insertions, 9 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; do \ + for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-plugins rabbitmq-sys; 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 b5c342aa..dac28b84 100644 --- a/packaging/generic-unix/Makefile +++ b/packaging/generic-unix/Makefile @@ -12,6 +12,9 @@ dist: MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \ install + cp -f rabbitmq-sys $(TARGET_DIR)/sbin + chmod 0755 $(TARGET_DIR)/sbin/rabbitmq-sys + tar -zcf $(TARGET_TARBALL).tar.gz $(TARGET_DIR) rm -rf $(SOURCE_DIR) $(TARGET_DIR) diff --git a/packaging/generic-unix/rabbitmq-sys b/packaging/generic-unix/rabbitmq-sys new file mode 100644 index 00000000..efd20766 --- /dev/null +++ b/packaging/generic-unix/rabbitmq-sys @@ -0,0 +1,32 @@ +#!/bin/sh +## The contents of this file are subject to the Mozilla Public License +## Version 1.1 (the "License"); you may not use this file except in +## compliance with the License. You may obtain a copy of the License +## at http://www.mozilla.org/MPL/ +## +## Software distributed under the License is distributed on an "AS IS" +## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See +## the License for the specific language governing rights and +## limitations under the License. +## +## The Original Code is RabbitMQ. +## +## The Initial Developer of the Original Code is VMware, Inc. +## Copyright (c) 2012 VMware, Inc. All rights reserved. +## + +### generic-unix ### + +## Set system default values +SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ +-kernel inet_default_connect_options [{nodelay,true}]" + +CONFIG_FILE=${RABBITMQ_HOME}/rabbitmq + +LOG_BASE=${RABBITMQ_HOME}/log + +MNESIA_BASE=${RABBITMQ_HOME}/mnesia + +PLUGINS_DIR=${RABBITMQ_HOME}/plugins + +ENABLED_PLUGINS_FILE=${RABBITMQ_HOME}/enabled_plugins diff --git a/scripts/rabbitmq-sys b/scripts/rabbitmq-sys index 948b92d3..c58341ef 100644 --- a/scripts/rabbitmq-sys +++ b/scripts/rabbitmq-sys @@ -16,16 +16,15 @@ ## ## Set system default values +SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ +-kernel inet_default_connect_options [{nodelay,true}]" + CONFIG_FILE=/etc/rabbitmq/rabbitmq + LOG_BASE=/var/log/rabbitmq + MNESIA_BASE=/var/lib/rabbitmq/mnesia + PLUGINS_DIR="${RABBITMQ_HOME}/plugins" -ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins -SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ --kernel inet_default_connect_options [{nodelay,true}]" -## CONFIG_FILE=${RABBITMQ_HOME}/rabbitmq -## LOG_BASE=${RABBITMQ_HOME}/log -## MNESIA_BASE=${RABBITMQ_HOME}/mnesia -## PLUGINS_DIR=${RABBITMQ_HOME}/plugins -## ENABLED_PLUGINS_FILE=${RABBITMQ_HOME}/enabled_plugins +ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins |