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

Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1

Browse source 
Conflicts:
	install_minimal/airtime-install
This commit is contained in:
Martin Konecny 2011-09-14 16:48:11 -04:00
commit 500fa759af
23 changed files with 664 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

8
install_minimal/upgrades/airtime-1.9.0/airtime-monit.cfg.190
View file

@ -13,10 +13,10 @@
with pidfile "/var/run/airtime-liquidsoap.pid"
start program = "/etc/init.d/airtime-playout start" with timeout 10 seconds
stop program = "/etc/init.d/airtime-playout stop"
# check process airtime-media-monitor
# with pidfile "/var/run/airtime-media-monitor.pid"
# start program = "/etc/init.d/airtime-media-monitor start" with timeout 10 seconds
# stop program = "/etc/init.d/airtime-media-monitor stop"
check process airtime-media-monitor
with pidfile "/var/run/airtime-media-monitor.pid"
start program = "/etc/init.d/airtime-media-monitor start" with timeout 10 seconds
stop program = "/etc/init.d/airtime-media-monitor stop"
check process airtime-show-recorder
with pidfile "/var/run/airtime-show-recorder.pid"
start program = "/etc/init.d/airtime-show-recorder start" with timeout 10 seconds

1
install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
View file

@ -67,6 +67,7 @@ class AirtimeInstall{
exec("rm -f /usr/bin/airtime-update-db-settings");
exec("rm -f /usr/bin/airtime-check-system");
exec("rm -f /usr/bin/airtime-user");
exec("rm -f /usr/bin/airtime-clean-storage ");
}
public static function DbTableExists($p_name)