From 3ded56fdc2577e5fc756d16e90fc1c03876b82f8 Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 28 Sep 2011 16:36:16 -0400 Subject: [PATCH 1/3] CC-2724: Play Stream Icon + jPlayer popup styling -changed to use /> - Kbit/s) - +
From 79f8e36ee439740e7e8ffe9927a03729beacae8d Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 28 Sep 2011 17:46:37 -0400 Subject: [PATCH 2/3] CC-2886: airtime-check-system should not fail Icecast check if Icecast outputs are not configured in /etc/airtime/liquidsoap.cfg --- install_minimal/airtime-install | 2 ++ install_minimal/include/airtime-upgrade.php | 2 ++ .../icecast2/airtime-icecast2-status.xsl | 7 ++++++ .../icecast2/install/icecast-install.py | 22 +++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 python_apps/icecast2/airtime-icecast2-status.xsl create mode 100644 python_apps/icecast2/install/icecast-install.py diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index bb45530d5..8f5f61bf6 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -54,6 +54,8 @@ python ${SCRIPTPATH}/../python_apps/show-recorder/install/recorder-install.py echo -e "\n*** Media Monitor Installation ***" python ${SCRIPTPATH}/../python_apps/media-monitor/install/media-monitor-install.py +python ${SCRIPTPATH}/../python_apps/icecast2/install/icecast2-install.py + # Need to ensure monit is running before Airtime daemons are run. This is # so we can ensure they can register with monit to monitor them when they start. # If monit is already running, this step is still useful as we need monit to diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php index f439b2eff..6affb2dc0 100644 --- a/install_minimal/include/airtime-upgrade.php +++ b/install_minimal/include/airtime-upgrade.php @@ -102,6 +102,8 @@ passthru("python $SCRIPTPATH/../../python_apps/show-recorder/install/recorder-in echo PHP_EOL."*** Updating Media Monitor ***".PHP_EOL; passthru("python $SCRIPTPATH/../../python_apps/media-monitor/install/media-monitor-install.py"); +passthru("python $SCRIPTPATH/../../python_apps/icecast2/install/icecast2-install.py"); + sleep(4); passthru("airtime-check-system"); diff --git a/python_apps/icecast2/airtime-icecast2-status.xsl b/python_apps/icecast2/airtime-icecast2-status.xsl new file mode 100644 index 000000000..565c81ebe --- /dev/null +++ b/python_apps/icecast2/airtime-icecast2-status.xsl @@ -0,0 +1,7 @@ + + + + + + + diff --git a/python_apps/icecast2/install/icecast-install.py b/python_apps/icecast2/install/icecast-install.py new file mode 100644 index 000000000..0b411d8da --- /dev/null +++ b/python_apps/icecast2/install/icecast-install.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- + +import shutil +import os +import sys + +if os.geteuid() != 0: + print "Please run this as root." + sys.exit(1) + +def get_current_script_dir(): + current_script_dir = os.path.realpath(__file__) + index = current_script_dir.rindex('/') + return current_script_dir[0:index] + +try: + current_script_dir = get_current_script_dir() + shutil.copy(current_script_dir+"/../airtime-icecast-status.xsl", "/usr/share/icecast2/web") + +except Exception, e: + print "exception: %s" % e + sys.exit(1) From e696f94eee1a9df1dae37c07e6f8135e13c14df7 Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 28 Sep 2011 17:47:16 -0400 Subject: [PATCH 3/3] CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder --- .../upgrades/airtime-2.0.0/airtime-upgrade.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php index ac5f99ade..b540021dc 100644 --- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php @@ -341,7 +341,6 @@ class AirtimeIni200{ const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg"; const CONF_FILE_MEDIAMONITOR = "/etc/airtime/media-monitor.cfg"; const CONF_FILE_API_CLIENT = "/etc/airtime/api_client.cfg"; - const CONF_FILE_MONIT = "/etc/monit/conf.d/airtime-monit.cfg"; const CONF_PYPO_GRP = "pypo"; const CONF_WWW_DATA_GRP = "www-data"; @@ -405,7 +404,7 @@ class AirtimeIni200{ foreach ($configFiles as $conf) { // we want to use new liquidsoap.cfg so don't merge // also for monit - if( $conf == AirtimeIni200::CONF_FILE_LIQUIDSOAP || $conf == AirtimeIni200::CONF_FILE_MONIT){ + if( $conf == AirtimeIni200::CONF_FILE_LIQUIDSOAP){ continue; } if (file_exists("$conf$suffix.bak")) { @@ -493,7 +492,7 @@ class AirtimeIni200{ $suffix = date("Ymdhis")."-2.0.0"; foreach ($configFiles as $conf) { // do not back up monit cfg - if (file_exists($conf) && $conf != AirtimeIni200::CONF_FILE_MONIT) { + if (file_exists($conf)) { echo "Backing up $conf to $conf$suffix.bak".PHP_EOL; //copy($conf, $conf.$suffix.".bak"); exec("cp -p $conf $conf$suffix.bak"); //use cli version to preserve file attributes @@ -538,10 +537,6 @@ class AirtimeIni200{ echo "Could not copy airtime-monit.cfg to /etc/monit/conf.d/. Exiting."; exit(1); } - if (!copy(__DIR__."/airtime-monit.cfg.$suffix", AirtimeIni200::CONF_FILE_MONIT)){ - echo "Could not copy airtime-monit.cfg to /etc/monit/conf.d/. Exiting."; - exit(1); - } } }