From 5862324da92a9a3aab4b30bdcc721de017e74ed5 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 14 Feb 2012 09:37:20 -0500 Subject: [PATCH] CC-3326: Make /etc/monit/conf.d is empty of any old Airtime files before upgrading! -fixed --- install_minimal/include/airtime-copy-files.sh | 1 + python_apps/pypo/install/pypo-remove-files.py | 1 + 2 files changed, 2 insertions(+) diff --git a/install_minimal/include/airtime-copy-files.sh b/install_minimal/include/airtime-copy-files.sh index 4eafde4a8..5eab4a4ef 100755 --- a/install_minimal/include/airtime-copy-files.sh +++ b/install_minimal/include/airtime-copy-files.sh @@ -42,6 +42,7 @@ fi echo "* Creating /etc/monit/conf.d/monit-airtime-generic.cfg" mkdir -p /etc/monit/conf.d/ if [ ! -e /etc/monit/conf.d/monit-airtime-generic.cfg ]; then + rm -f /etc/monit/conf.d/*airtime* cp $AIRTIMEROOT/python_apps/monit/monit-airtime-generic.cfg /etc/monit/conf.d/ fi diff --git a/python_apps/pypo/install/pypo-remove-files.py b/python_apps/pypo/install/pypo-remove-files.py index 1f91fe766..12622c3b5 100644 --- a/python_apps/pypo/install/pypo-remove-files.py +++ b/python_apps/pypo/install/pypo-remove-files.py @@ -48,6 +48,7 @@ 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