From f6ae2aaa9174b5357bc1e949e80285e01591c928 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 3 Jun 2011 11:30:08 -0400 Subject: [PATCH] cc-2055: switch to init.d -enabled media-monitor in the installs scripts. --- install/airtime-install | 5 ++--- install/airtime-uninstall | 6 +++--- install/include/AirtimeIni.php | 11 +++++------ python_apps/media-monitor/MediaMonitor.py | 2 +- .../media-monitor/install/media-monitor-install.py | 2 +- .../media-monitor/install/media-monitor-uninstall.py | 2 +- .../{MediaMonitor.cfg => media-monitor.cfg} | 0 7 files changed, 13 insertions(+), 15 deletions(-) rename python_apps/media-monitor/{MediaMonitor.cfg => media-monitor.cfg} (100%) diff --git a/install/airtime-install b/install/airtime-install index f995d14a7..b86f03ad8 100755 --- a/install/airtime-install +++ b/install/airtime-install @@ -22,9 +22,8 @@ python ${SCRIPTPATH}/../python_apps/pypo/install/pypo-install.py echo -e "\n*** Recorder Installation ***" python ${SCRIPTPATH}/../python_apps/show-recorder/install/recorder-install.py -#echo -e "\n*** Media Monitor Installation ***" -#python ${SCRIPTPATH}/../python_apps/pytag-fs/install/media-monitor-install.py - +echo -e "\n*** Media Monitor Installation ***" +python ${SCRIPTPATH}/../python_apps/media-monitor/install/media-monitor-install.py sleep 4 airtime-check-system diff --git a/install/airtime-uninstall b/install/airtime-uninstall index d8db1d429..4168eb8e7 100755 --- a/install/airtime-uninstall +++ b/install/airtime-uninstall @@ -12,12 +12,12 @@ php ${SCRIPTPATH}/airtime-uninstall.php echo -e "\n*** Uninstalling Pypo ***" python ${SCRIPTPATH}/../python_apps/pypo/install/pypo-uninstall.py -echo -e "\n*** Uninstalling Show Recorder ***" -python ${SCRIPTPATH}/../python_apps/show-recorder/install/recorder-uninstall.py - #echo -e "\n*** Uninstalling Media Monitor ***" #python ${SCRIPTPATH}/../python_apps/pytag-fs/install/media-monitor-uninstall.py +echo -e "\n*** Uninstalling Show Recorder ***" +python ${SCRIPTPATH}/../python_apps/show-recorder/install/recorder-uninstall.py + echo -e "\n*** Removing Pypo User ***" python ${SCRIPTPATH}/../python_apps/remove-pypo-user.py diff --git a/install/include/AirtimeIni.php b/install/include/AirtimeIni.php index 65243eb08..7f2ff24e8 100644 --- a/install/include/AirtimeIni.php +++ b/install/include/AirtimeIni.php @@ -26,7 +26,7 @@ class AirtimeIni const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg"; const CONF_FILE_RECORDER = "/etc/airtime/recorder.cfg"; const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg"; - //const CONF_FILE_MEDIAMONITOR = "/etc/airtime/MediaMonitor.cfg"; + const CONF_FILE_MEDIAMONITOR = "/etc/airtime/media-monitor.cfg"; public static function IniFilesExist() { @@ -73,11 +73,10 @@ class AirtimeIni echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting."; exit(1); } - //wait until Airtime 1.9.0 - //if (!copy(__DIR__."/../../python_apps/pytag-fs/MediaMonitor.cfg", AirtimeIni::CONF_FILE_MEDIAMONITOR)){ - // echo "Could not copy MediaMonitor.cfg to /etc/airtime/. Exiting."; - // exit(1); - //} + if (!copy(__DIR__."/../../python_apps/media-monitor/media-monitor.cfg", AirtimeIni::CONF_FILE_MEDIAMONITOR)){ + echo "Could not copy MediaMonitor.cfg to /etc/airtime/. Exiting."; + exit(1); + } } /** diff --git a/python_apps/media-monitor/MediaMonitor.py b/python_apps/media-monitor/MediaMonitor.py index 48d4e2035..afb249f73 100644 --- a/python_apps/media-monitor/MediaMonitor.py +++ b/python_apps/media-monitor/MediaMonitor.py @@ -31,7 +31,7 @@ except Exception, e: # loading config file try: - config = ConfigObj('/etc/airtime/MediaMonitor.cfg') + config = ConfigObj('/etc/airtime/media-monitor.cfg') except Exception, e: logger = logging.getLogger(); logger.error('Error loading config file: %s', e) diff --git a/python_apps/media-monitor/install/media-monitor-install.py b/python_apps/media-monitor/install/media-monitor-install.py index 2ea6e94df..36f491c57 100755 --- a/python_apps/media-monitor/install/media-monitor-install.py +++ b/python_apps/media-monitor/install/media-monitor-install.py @@ -20,7 +20,7 @@ if os.geteuid() != 0: print "Please run this as root." sys.exit(1) -PATH_INI_FILE = '/etc/airtime/MediaMonitor.cfg' +PATH_INI_FILE = '/etc/airtime/media-monitor.cfg' def create_path(path): if not (os.path.exists(path)): diff --git a/python_apps/media-monitor/install/media-monitor-uninstall.py b/python_apps/media-monitor/install/media-monitor-uninstall.py index 082ce2072..d2732bffb 100755 --- a/python_apps/media-monitor/install/media-monitor-uninstall.py +++ b/python_apps/media-monitor/install/media-monitor-uninstall.py @@ -9,7 +9,7 @@ if os.geteuid() != 0: print "Please run this as root." sys.exit(1) -PATH_INI_FILE = '/etc/airtime/MediaMonitor.cfg' +PATH_INI_FILE = '/etc/airtime/media-monitor.cfg' def remove_path(path): os.system("rm -rf " + path) diff --git a/python_apps/media-monitor/MediaMonitor.cfg b/python_apps/media-monitor/media-monitor.cfg similarity index 100% rename from python_apps/media-monitor/MediaMonitor.cfg rename to python_apps/media-monitor/media-monitor.cfg