Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc-2055: switch to init.d 

-enabled media-monitor in the installs scripts.
This commit is contained in:
martin 2011-06-03 11:30:08 -04:00
parent 7e0db3b76c
commit f6ae2aaa91
7 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install/airtime-install
View File

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

6
install/airtime-uninstall
View File

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

11
install/include/AirtimeIni.php
View File

@ -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);
}
}
/**

2
python_apps/media-monitor/MediaMonitor.py
View File

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

2
python_apps/media-monitor/install/media-monitor-install.py
View File

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

2
python_apps/media-monitor/install/media-monitor-uninstall.py
View File

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

0
python_apps/media-monitor/MediaMonitor.cfg → python_apps/media-monitor/media-monitor.cfg
View File