From f5b1daf2e071fbf467c26187bfbf5cf1fd01e99a Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Wed, 8 May 2013 15:53:53 -0400
Subject: [PATCH] CC-5071: Better RabbitMQ passwords

-remove rabbitmq vhost on uninstall
---
 install_minimal/airtime-install   |  2 --
 install_minimal/airtime-uninstall | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index 50cfab243..c646d2e83 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -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"
diff --git a/install_minimal/airtime-uninstall b/install_minimal/airtime-uninstall
index 78e9b03e4..bc12a4403 100755
--- a/install_minimal/airtime-uninstall
+++ b/install_minimal/airtime-uninstall
@@ -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