CC-2886: airtime-check-system should not fail Icecast check

if Icecast outputs are not configured in
 /etc/airtime/liquidsoap.cfg
This commit is contained in:
martin 2011-09-28 17:46:37 -04:00
parent 23f076d348
commit 79f8e36ee4
4 changed files with 33 additions and 0 deletions

View File

@ -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

View File

@ -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");

View File

@ -0,0 +1,7 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>

View File

@ -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)