CC-5071: Better RabbitMQ passwords
-create rabbitmq host on upgrade as well
This commit is contained in:
parent
4dba722272
commit
7b4b0805a9
|
@ -27,8 +27,13 @@ rabbitmq_install () {
|
||||||
RABBITMQ_PASSWORD=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^password/ ) print $2}' /etc/airtime/airtime.conf)
|
RABBITMQ_PASSWORD=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^password/ ) print $2}' /etc/airtime/airtime.conf)
|
||||||
EXCHANGES="airtime-pypo|pypo-fetch|airtime-media-monitor|media-monitor"
|
EXCHANGES="airtime-pypo|pypo-fetch|airtime-media-monitor|media-monitor"
|
||||||
|
|
||||||
rabbitmqctl delete_vhost $RABBITMQ_VHOST
|
rabbitmqctl list_vhosts | grep $RABBITMQ_VHOST
|
||||||
rabbitmqctl delete_user $RABBITMQ_USER
|
RESULT="$?"
|
||||||
|
|
||||||
|
if [ $RESULT = "0" ]; then
|
||||||
|
rabbitmqctl delete_vhost $RABBITMQ_VHOST
|
||||||
|
rabbitmqctl delete_user $RABBITMQ_USER
|
||||||
|
fi
|
||||||
|
|
||||||
rabbitmqctl add_vhost $RABBITMQ_VHOST
|
rabbitmqctl add_vhost $RABBITMQ_VHOST
|
||||||
rabbitmqctl add_user $RABBITMQ_USER $RABBITMQ_PASSWORD
|
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"
|
echo "There was an error during install. Exit code $result"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rabbitmq_install
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
rabbitmq_install
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
|
||||||
export airtime_service_start='t'
|
export airtime_service_start='t'
|
||||||
$SCRIPTPATH/include/airtime-copy-files.sh
|
$SCRIPTPATH/include/airtime-copy-files.sh
|
||||||
$SCRIPTPATH/include/airtime-initialize.sh $@
|
$SCRIPTPATH/include/airtime-initialize.sh $@
|
||||||
|
|
Loading…
Reference in New Issue