CC-5071: Better RabbitMQ passwords
-remove rabbitmq vhost on uninstall
This commit is contained in:
parent
ebfa5b8c5c
commit
f5b1daf2e0
|
@ -22,7 +22,6 @@ showhelp () {
|
|||
}
|
||||
|
||||
rabbitmq_install () {
|
||||
echo "RABBIT!!!"
|
||||
RABBITMQ_VHOST="/airtime"
|
||||
RABBITMQ_USER="airtime"
|
||||
RABBITMQ_PASSWORD=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^password/ ) print $2}' /etc/airtime/airtime.conf)
|
||||
|
@ -38,7 +37,6 @@ rabbitmq_install () {
|
|||
export RABBITMQ_USER
|
||||
export RABBITMQ_PASSWORD
|
||||
export RABBITMQ_VHOST
|
||||
|
||||
}
|
||||
|
||||
overwrite="f"
|
||||
|
|
|
@ -28,6 +28,14 @@ done
|
|||
#Make 'purge' env variable available to sub bash script
|
||||
export purge
|
||||
|
||||
rabbitmq_uninstall () {
|
||||
RABBITMQ_VHOST="/airtime"
|
||||
RABBITMQ_USER="airtime"
|
||||
|
||||
rabbitmqctl delete_vhost $RABBITMQ_VHOST
|
||||
rabbitmqctl delete_user $RABBITMQ_USER
|
||||
}
|
||||
|
||||
echo -e "\n******************************* Uninstall Begin ********************************"
|
||||
|
||||
# Absolute path to this script, e.g. /home/user/bin/foo.sh
|
||||
|
@ -35,6 +43,8 @@ SCRIPT=`readlink -f $0`
|
|||
# Absolute path this script is in, thus /home/user/bin
|
||||
SCRIPTPATH=`dirname $SCRIPT`
|
||||
|
||||
rabbitmq_uninstall
|
||||
|
||||
virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
|
||||
. ${virtualenv_bin}activate
|
||||
|
||||
|
|
Loading…
Reference in New Issue