From dccdc9a845a3f50ac45cf9980c65c4b837d8966e Mon Sep 17 00:00:00 2001
From: martin <martin@martin-DX4840.(none)>
Date: Tue, 1 Nov 2011 14:02:05 -0400
Subject: [PATCH 1/3] CC-3009: Install script installs virtualenv twice.

-fixed
---
 install_minimal/include/airtime-copy-files.sh   | 1 -
 install_minimal/include/airtime-initialize.sh   | 1 -
 install_minimal/include/airtime-remove-files.sh | 1 -
 install_minimal/include/airtime-uninitialize.sh | 3 +++
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install_minimal/include/airtime-copy-files.sh b/install_minimal/include/airtime-copy-files.sh
index 964c11a9b..2967ef64a 100755
--- a/install_minimal/include/airtime-copy-files.sh
+++ b/install_minimal/include/airtime-copy-files.sh
@@ -45,7 +45,6 @@ HOUR=$(($RANDOM%24))
 MIN=$(($RANDOM%60))
 echo "$MIN $HOUR * * * root /usr/lib/airtime/utils/phone_home_stat" > /etc/cron.d/airtime-crons
 
-$AIRTIMEROOT/python_apps/python-virtualenv/virtualenv-install.sh
 virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate
 
diff --git a/install_minimal/include/airtime-initialize.sh b/install_minimal/include/airtime-initialize.sh
index 91fb92f75..3dfc95dba 100755
--- a/install_minimal/include/airtime-initialize.sh
+++ b/install_minimal/include/airtime-initialize.sh
@@ -14,7 +14,6 @@ SCRIPTPATH=`dirname $SCRIPT`
 
 AIRTIMEROOT=$SCRIPTPATH/../../
 
-$AIRTIMEROOT/python_apps/python-virtualenv/virtualenv-install.sh
 virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate
 
diff --git a/install_minimal/include/airtime-remove-files.sh b/install_minimal/include/airtime-remove-files.sh
index a0e773611..47c021d28 100755
--- a/install_minimal/include/airtime-remove-files.sh
+++ b/install_minimal/include/airtime-remove-files.sh
@@ -29,7 +29,6 @@ AIRTIMEROOT=$SCRIPTPATH/../../
 
 rm -f /etc/cron.d/airtime-crons
 
-$AIRTIMEROOT/python_apps/python-virtualenv/virtualenv-install.sh
 virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate
 
diff --git a/install_minimal/include/airtime-uninitialize.sh b/install_minimal/include/airtime-uninitialize.sh
index a912b00ae..f79a9c90a 100755
--- a/install_minimal/include/airtime-uninitialize.sh
+++ b/install_minimal/include/airtime-uninitialize.sh
@@ -23,6 +23,9 @@ monit unmonitor airtime-show-recorder >/dev/null 2>&1
 #monit unmonitor rabbitmq-server
 set -e
 
+virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
+. ${virtualenv_bin}activate
+
 #uninitialize Airtime services
 python $AIRTIMEROOT/python_apps/pypo/install/pypo-uninitialize.py
 python $AIRTIMEROOT/python_apps/media-monitor/install/media-monitor-uninitialize.py

From 306e886f58f5e5cc455fb0803e2cdd8c923f18ee Mon Sep 17 00:00:00 2001
From: martin <martin@martin-DX4840.(none)>
Date: Tue, 1 Nov 2011 14:07:56 -0400
Subject: [PATCH 2/3] CC-3009: Install script installs virtualenv twice.

-fixed
---
 install_minimal/airtime-install | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index 1fc2bff04..c02b5a87e 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -36,8 +36,12 @@ echo -e "\n******************************** Install Begin **********************
 SCRIPT=`readlink -f $0`
 # Absolute path this script is in, thus /home/user/bin
 SCRIPTPATH=`dirname $SCRIPT`
+AIRTIMEROOT=$SCRIPTPATH/../
+
+$AIRTIMEROOT/python_apps/python-virtualenv/virtualenv-install.sh
+python $AIRTIMEROOT/python_apps/create-pypo-user.py
+
 
-python $SCRIPTPATH/../python_apps/create-pypo-user.py
 
 $SCRIPTPATH/include/airtime-copy-files.sh
 $SCRIPTPATH/include/airtime-initialize.sh $@

From d2f4e55dd6d53bdf3c63e3135e9ae883c2c884bf Mon Sep 17 00:00:00 2001
From: martin <martin@martin-DX4840.(none)>
Date: Tue, 1 Nov 2011 14:35:54 -0400
Subject: [PATCH 3/3] -re-enable rabbitmq monit monitoring

---
 install_minimal/airtime-install               | 2 --
 install_minimal/include/airtime-initialize.sh | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index c02b5a87e..426ec0087 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -41,8 +41,6 @@ AIRTIMEROOT=$SCRIPTPATH/../
 $AIRTIMEROOT/python_apps/python-virtualenv/virtualenv-install.sh
 python $AIRTIMEROOT/python_apps/create-pypo-user.py
 
-
-
 $SCRIPTPATH/include/airtime-copy-files.sh
 $SCRIPTPATH/include/airtime-initialize.sh $@
 
diff --git a/install_minimal/include/airtime-initialize.sh b/install_minimal/include/airtime-initialize.sh
index 3dfc95dba..e03b92448 100755
--- a/install_minimal/include/airtime-initialize.sh
+++ b/install_minimal/include/airtime-initialize.sh
@@ -47,5 +47,5 @@ monit monitor airtime-media-monitor
 monit monitor airtime-liquidsoap
 monit monitor airtime-playout
 monit monitor airtime-show-recorder
-#monit monitor rabbitmq-server
+monit monitor rabbitmq-server
 set -e