From fe14113b58f5cc51b53e61cadab5087bfcf72d22 Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 20 Jun 2011 17:24:12 -0400 Subject: [PATCH] CC-2410: Clean up install process -reduced number of messages -got rid of some warnings. -moved airtime-install.php, airtime-upgrade.php, airtime-uninstall.php --- install/airtime-install | 2 +- install/airtime-uninstall | 5 +++-- install/include/AirtimeIni.php | 4 ++++ install/{ => include}/airtime-install.php | 6 +++--- install/{ => include}/airtime-uninstall.php | 5 +++-- install/{ => include}/airtime-upgrade.php | 3 +++ install/upgrades/airtime-1.9/airtime-upgrade.php | 1 - python_apps/media-monitor/install/media-monitor-install.py | 2 +- .../media-monitor/install/media-monitor-uninstall.py | 2 +- python_apps/pypo/install/pypo-install.py | 2 +- python_apps/pypo/install/pypo-uninstall.py | 2 +- python_apps/show-recorder/install/recorder-install.py | 2 +- python_apps/show-recorder/install/recorder-uninstall.py | 2 +- 13 files changed, 23 insertions(+), 15 deletions(-) rename install/{ => include}/airtime-install.php (94%) rename install/{ => include}/airtime-uninstall.php (96%) rename install/{ => include}/airtime-upgrade.php (97%) diff --git a/install/airtime-install b/install/airtime-install index bc2187d68..c5b151823 100755 --- a/install/airtime-install +++ b/install/airtime-install @@ -14,7 +14,7 @@ echo -e "\n******************************** Install Begin ********************** echo -e "\n*** Creating Pypo User ***" python ${SCRIPTPATH}/../python_apps/create-pypo-user.py -php ${SCRIPTPATH}/airtime-install.php $@ +php ${SCRIPTPATH}/include/airtime-install.php $@ echo -e "\n*** Pypo Installation ***" python ${SCRIPTPATH}/../python_apps/pypo/install/pypo-install.py diff --git a/install/airtime-uninstall b/install/airtime-uninstall index 6bfb48c21..9f708e10f 100755 --- a/install/airtime-uninstall +++ b/install/airtime-uninstall @@ -11,8 +11,6 @@ SCRIPTPATH=`dirname $SCRIPT` echo -e "\n******************************* Uninstall Begin ********************************" -php ${SCRIPTPATH}/airtime-uninstall.php - echo -e "\n*** Uninstalling Pypo ***" python ${SCRIPTPATH}/../python_apps/pypo/install/pypo-uninstall.py @@ -25,6 +23,9 @@ python ${SCRIPTPATH}/../python_apps/media-monitor/install/media-monitor-uninstal echo -e "\n*** Removing Pypo User ***" python ${SCRIPTPATH}/../python_apps/remove-pypo-user.py +php ${SCRIPTPATH}/include/airtime-uninstall.php + + echo -e "\n****************************** Uninstall Complete ******************************\n" echo "NOTE: To fully remove all Airtime files, you will also have to manually delete" echo " the directories '/srv/airtime'(default storage location of media files)" diff --git a/install/include/AirtimeIni.php b/install/include/AirtimeIni.php index 1dc2b7d19..82820108d 100644 --- a/install/include/AirtimeIni.php +++ b/install/include/AirtimeIni.php @@ -88,6 +88,10 @@ class AirtimeIni } } + public static function RemoveMonitFile(){ + unlink("/etc/monit/conf.d/airtime-monit.cfg"); + } + /** * This function removes /etc/airtime and the configuration * files present within it. diff --git a/install/airtime-install.php b/install/include/airtime-install.php similarity index 94% rename from install/airtime-install.php rename to install/include/airtime-install.php index ebec6de04..ff85d83fc 100644 --- a/install/airtime-install.php +++ b/install/include/airtime-install.php @@ -8,10 +8,10 @@ * Performs a new install (new configs, database install) if a version of Airtime is not found * If the current version is found to be installed the User is presented with the help menu and can choose -r to reinstall. */ -set_include_path(__DIR__.'/../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); +set_include_path(__DIR__.'/../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); -require_once(dirname(__FILE__).'/include/AirtimeIni.php'); -require_once(dirname(__FILE__).'/include/AirtimeInstall.php'); +require_once(dirname(__FILE__).'/AirtimeIni.php'); +require_once(dirname(__FILE__).'/AirtimeInstall.php'); require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/constants.php'); AirtimeInstall::ExitIfNotRoot(); diff --git a/install/airtime-uninstall.php b/install/include/airtime-uninstall.php similarity index 96% rename from install/airtime-uninstall.php rename to install/include/airtime-uninstall.php index d1489d893..27839ad6d 100644 --- a/install/airtime-uninstall.php +++ b/install/include/airtime-uninstall.php @@ -5,8 +5,8 @@ * @license http://www.gnu.org/licenses/gpl.txt */ -require_once(dirname(__FILE__).'/include/AirtimeIni.php'); -require_once(dirname(__FILE__).'/include/AirtimeInstall.php'); +require_once(dirname(__FILE__).'/AirtimeIni.php'); +require_once(dirname(__FILE__).'/AirtimeInstall.php'); // Need to check that we are superuser before running this. AirtimeInstall::ExitIfNotRoot(); @@ -88,5 +88,6 @@ if ($results == 0) { AirtimeInstall::RemoveSymlinks(); AirtimeInstall::UninstallBinaries(); AirtimeInstall::RemoveLogDirectories(); +AirtimeIni::RemoveMonitFile(); /* FINISHED AIRTIME PHP UNINSTALLER */ diff --git a/install/airtime-upgrade.php b/install/include/airtime-upgrade.php similarity index 97% rename from install/airtime-upgrade.php rename to install/include/airtime-upgrade.php index 1cf4b8a3e..488dc3678 100644 --- a/install/airtime-upgrade.php +++ b/install/include/airtime-upgrade.php @@ -9,6 +9,7 @@ //Pear classes. set_include_path(__DIR__.'/../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path()); require_once('DB.php'); +require_once(dirname(__FILE__).'/include/AirtimeIni.php'); if(exec("whoami") != "root"){ echo "Must be root user.\n"; @@ -99,5 +100,7 @@ passthru("python ".__DIR__."/../python_apps/show-recorder/install/recorder-insta echo PHP_EOL."*** Updating Media Monitor ***".PHP_EOL; passthru("python ".__DIR__."/../python_apps/media-monitor/install/media-monitor-install.py"); +AirtimeIni::CreateMonitFile(); + echo "******************************* Update Complete *******************************".PHP_EOL; diff --git a/install/upgrades/airtime-1.9/airtime-upgrade.php b/install/upgrades/airtime-1.9/airtime-upgrade.php index d988fb806..51ab6091b 100644 --- a/install/upgrades/airtime-1.9/airtime-upgrade.php +++ b/install/upgrades/airtime-1.9/airtime-upgrade.php @@ -82,7 +82,6 @@ $values = parse_ini_file(CONF_FILE_AIRTIME, true); $phpDir = $values['general']['airtime_dir']; InstallPhpCode($phpDir); -AirtimeIni::CreateMonitFile(); //update utils (/usr/lib/airtime) folder UninstallBinaries(); diff --git a/python_apps/media-monitor/install/media-monitor-install.py b/python_apps/media-monitor/install/media-monitor-install.py index ad0ef1b07..c6e38b431 100755 --- a/python_apps/media-monitor/install/media-monitor-install.py +++ b/python_apps/media-monitor/install/media-monitor-install.py @@ -69,7 +69,7 @@ try: print "Installing media-monitor daemon" shutil.copy(config["bin_dir"]+"/airtime-media-monitor-init-d", "/etc/init.d/airtime-media-monitor") - p = Popen("update-rc.d airtime-media-monitor defaults", shell=True) + p = Popen("update-rc.d airtime-media-monitor defaults >/dev/null 2>&1", shell=True) sts = os.waitpid(p.pid, 0)[1] print "Waiting for processes to start..." diff --git a/python_apps/media-monitor/install/media-monitor-uninstall.py b/python_apps/media-monitor/install/media-monitor-uninstall.py index 4f587d46b..db2e07a8a 100755 --- a/python_apps/media-monitor/install/media-monitor-uninstall.py +++ b/python_apps/media-monitor/install/media-monitor-uninstall.py @@ -29,7 +29,7 @@ try: os.system("/etc/init.d/airtime-media-monitor stop") os.system("rm -f /etc/init.d/airtime-media-monitor") - os.system("update-rc.d -f airtime-media-monitor remove") + os.system("update-rc.d -f airtime-media-monitor remove >/dev/null 2>&1") print "Removing log directories" remove_path(config["log_dir"]) diff --git a/python_apps/pypo/install/pypo-install.py b/python_apps/pypo/install/pypo-install.py index 47ffedc97..5b8df115c 100755 --- a/python_apps/pypo/install/pypo-install.py +++ b/python_apps/pypo/install/pypo-install.py @@ -106,7 +106,7 @@ try: print "Installing pypo daemon" shutil.copy(config["bin_dir"]+"/bin/airtime-playout-init-d", "/etc/init.d/airtime-playout") - p = Popen("update-rc.d airtime-playout defaults", shell=True) + p = Popen("update-rc.d airtime-playout defaults >/dev/null 2>&1", shell=True) sts = os.waitpid(p.pid, 0)[1] print "Waiting for processes to start..." diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py index 7b7cf881f..d2596099b 100755 --- a/python_apps/pypo/install/pypo-uninstall.py +++ b/python_apps/pypo/install/pypo-uninstall.py @@ -29,7 +29,7 @@ try: os.system("/etc/init.d/airtime-playout stop") os.system("rm -f /etc/init.d/airtime-playout") - os.system("update-rc.d -f airtime-playout remove") + os.system("update-rc.d -f airtime-playout remove >/dev/null 2>&1") print "Removing cache directories" remove_path(config["cache_base_dir"]) diff --git a/python_apps/show-recorder/install/recorder-install.py b/python_apps/show-recorder/install/recorder-install.py index ea8cb84e8..3d7ff1bc6 100755 --- a/python_apps/show-recorder/install/recorder-install.py +++ b/python_apps/show-recorder/install/recorder-install.py @@ -66,7 +66,7 @@ try: print "Installing show-recorder daemon" shutil.copy(config["bin_dir"]+"/airtime-show-recorder-init-d", "/etc/init.d/airtime-show-recorder") - p = Popen("update-rc.d airtime-show-recorder defaults", shell=True) + p = Popen("update-rc.d airtime-show-recorder defaults >/dev/null 2>&1", shell=True) sts = os.waitpid(p.pid, 0)[1] print "Waiting for processes to start..." diff --git a/python_apps/show-recorder/install/recorder-uninstall.py b/python_apps/show-recorder/install/recorder-uninstall.py index df4511428..2b7fb1b55 100755 --- a/python_apps/show-recorder/install/recorder-uninstall.py +++ b/python_apps/show-recorder/install/recorder-uninstall.py @@ -29,7 +29,7 @@ try: os.system("/etc/init.d/airtime-show-recorder stop") os.system("rm -f /etc/init.d/airtime-show-recorder") - os.system("update-rc.d -f airtime-show-recorder remove") + os.system("update-rc.d -f airtime-show-recorder remove >/dev/null 2>&1") print "Removing log directories" remove_path(config["log_dir"])