From 215e5ccb4c013f60aba13a5eeb1a64cbe80112fe Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 5 Mar 2013 16:21:05 -0500
Subject: [PATCH] CC-5001: remove
 /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg on 2.3.1 upgrade

-don't even install rabbitmq monit file
---
 install_minimal/include/airtime-initialize.sh | 1 -
 python_apps/pypo/install/pypo-copy-files.py   | 1 -
 python_apps/pypo/install/pypo-remove-files.py | 1 -
 3 files changed, 3 deletions(-)

diff --git a/install_minimal/include/airtime-initialize.sh b/install_minimal/include/airtime-initialize.sh
index b83967016..50cf65b9f 100755
--- a/install_minimal/include/airtime-initialize.sh
+++ b/install_minimal/include/airtime-initialize.sh
@@ -45,7 +45,6 @@ chmod 600 /etc/monit/conf.d/monit-airtime-liquidsoap.cfg
 chmod 600 /etc/monit/conf.d/monit-airtime-media-monitor.cfg
 chmod 600 /etc/monit/conf.d/monit-airtime-playout.cfg
 chmod 600 /etc/monit/conf.d/monit-airtime-liquidsoap.cfg
-chmod 600 /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg
 
 # Start monit if it is not running, or restart if it is.
 # Need to ensure monit is running before Airtime daemons are run. This is
diff --git a/python_apps/pypo/install/pypo-copy-files.py b/python_apps/pypo/install/pypo-copy-files.py
index fd80e7113..e88b46a64 100644
--- a/python_apps/pypo/install/pypo-copy-files.py
+++ b/python_apps/pypo/install/pypo-copy-files.py
@@ -88,7 +88,6 @@ try:
     #copy monit files
     shutil.copy('%s/../../monit/monit-airtime-generic.cfg'%current_script_dir, '/etc/monit/conf.d/')
     subprocess.call('sed -i "s/\$admin_pass/%s/g" /etc/monit/conf.d/monit-airtime-generic.cfg' % get_rand_string(), shell=True)
-    shutil.copy('%s/../../monit/monit-airtime-rabbitmq-server.cfg'%current_script_dir, '/etc/monit/conf.d/')
 
     monit_version = get_monit_version()
     if version_compare(monit_version, "5.3.0") >= 0:
diff --git a/python_apps/pypo/install/pypo-remove-files.py b/python_apps/pypo/install/pypo-remove-files.py
index 6b26d7484..3a20a2dda 100644
--- a/python_apps/pypo/install/pypo-remove-files.py
+++ b/python_apps/pypo/install/pypo-remove-files.py
@@ -49,7 +49,6 @@ try:
     remove_file("/etc/monit/conf.d/monit-airtime-playout.cfg")
     remove_file("/etc/monit/conf.d/monit-airtime-liquidsoap.cfg")
     remove_file("/etc/monit/conf.d/monit-airtime-generic.cfg")
-    remove_file("/etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg")
 
 except Exception, e:
     print e