From 7b4b0805a9c4f43402da8e5934bf63735079b4ad Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 8 May 2013 16:59:43 -0400 Subject: [PATCH] CC-5071: Better RabbitMQ passwords -create rabbitmq host on upgrade as well --- install_minimal/airtime-install | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index c646d2e83..833cb447e 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -27,8 +27,13 @@ rabbitmq_install () { RABBITMQ_PASSWORD=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^password/ ) print $2}' /etc/airtime/airtime.conf) EXCHANGES="airtime-pypo|pypo-fetch|airtime-media-monitor|media-monitor" - rabbitmqctl delete_vhost $RABBITMQ_VHOST - rabbitmqctl delete_user $RABBITMQ_USER + rabbitmqctl list_vhosts | grep $RABBITMQ_VHOST + RESULT="$?" + + if [ $RESULT = "0" ]; then + rabbitmqctl delete_vhost $RABBITMQ_VHOST + rabbitmqctl delete_user $RABBITMQ_USER + fi rabbitmqctl add_vhost $RABBITMQ_VHOST rabbitmqctl add_user $RABBITMQ_USER $RABBITMQ_PASSWORD @@ -216,11 +221,12 @@ if [ "$DO_UPGRADE" -eq "0" ]; then echo "There was an error during install. Exit code $result" exit 1 fi - - rabbitmq_install fi + +rabbitmq_install set -e + export airtime_service_start='t' $SCRIPTPATH/include/airtime-copy-files.sh $SCRIPTPATH/include/airtime-initialize.sh $@