diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-02-12 11:29:21 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-02-12 11:29:21 +0000 |
| commit | 65869973d6f21a5165de6257c8461401fcefa61f (patch) | |
| tree | 6155a3c078624d4e36f9ff0d337e48f084f2bd38 | |
| parent | 917bcbea4704bd79019b961b4f3909f174c711b3 (diff) | |
| parent | 4013861270adcf91fb2eed6b62bfc2052b149d6a (diff) | |
| download | rabbitmq-server-65869973d6f21a5165de6257c8461401fcefa61f.tar.gz | |
merge heads
| -rw-r--r-- | packaging/macports/Makefile | 4 | ||||
| -rw-r--r-- | packaging/windows/Makefile | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-multi | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile index 243864e1..d5633955 100644 --- a/packaging/macports/Makefile +++ b/packaging/macports/Makefile @@ -38,10 +38,6 @@ macports: dirs $(DEST)/Portfile sed -i -e 's|@SU_RABBITMQ_SH_C@|sudo -E -u rabbitmq -H /bin/sh -c|' \ $(DEST)/files/rabbitmq-script-wrapper cp patch-org.macports.rabbitmq-server.plist.diff $(DEST)/files - -# This target ssh's into the OSX host in order to finalize the -# macports repo -macports_index: if [ -n "$(MACPORTS_USERHOST)" ] ; then \ tar cf - -C $(MACPORTS_DIR) . | ssh $(SSH_OPTS) lshift@macrabbit ' \ d="/tmp/mkportindex.$$$$" ; \ diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile index f17fe777..c9e818ac 100644 --- a/packaging/windows/Makefile +++ b/packaging/windows/Makefile @@ -22,7 +22,7 @@ dist: mv $(SOURCE_DIR) $(TARGET_DIR) pod2text --loose rabbitmq-service.pod $(TARGET_DIR)/readme-service.txt - unix2dos $(TARGET_DIR)/readme-service.txt + todos $(TARGET_DIR)/readme-service.txt zip -r $(TARGET_ZIP).zip $(TARGET_DIR) rm -rf $(TARGET_DIR) diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi index 907dce36..8341d35c 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -40,8 +40,8 @@ CONFIG_FILE=/etc/rabbitmq/rabbitmq DEFAULT_NODE_IP_ADDRESS=0.0.0.0 DEFAULT_NODE_PORT=5672 -[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} -[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} +[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} +[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] then if [ "x" != "x$RABBITMQ_NODE_PORT" ] diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index dde0dea2..638498c1 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -44,8 +44,8 @@ SERVER_START_ARGS= DEFAULT_NODE_IP_ADDRESS=0.0.0.0 DEFAULT_NODE_PORT=5672 -[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} -[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} +[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} +[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] then if [ "x" != "x$RABBITMQ_NODE_PORT" ] |