diff --git a/airtime_mvc/application/controllers/UpgradeController.php b/airtime_mvc/application/controllers/UpgradeController.php index 95cc8c986..2af18cc37 100644 --- a/airtime_mvc/application/controllers/UpgradeController.php +++ b/airtime_mvc/application/controllers/UpgradeController.php @@ -27,31 +27,22 @@ class UpgradeController extends Zend_Controller_Action $maintenanceFile = $_SERVER['AIRTIME_BASE']."maintenance.txt"; $file = fopen($maintenanceFile, 'w'); fclose($file); - + //Begin upgrade - $filename = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf"; - $values = parse_ini_file($filename, true); - - $username = $values['database']['dbuser']; - $password = $values['database']['dbpass']; - $host = $values['database']['host']; - $database = $values['database']['dbname']; - $dir = __DIR__; - - passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_$airtime_upgrade_version/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\""); + //Update disk_usage value in cc_pref $storDir = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."srv/airtime/stor" : "/srv/airtime/stor"; $diskUsage = shell_exec("du -sb $storDir | awk '{print $1}'"); Application_Model_Preference::setDiskUsage($diskUsage); - - $iniFile = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."application.ini" : "/usr/share/airtime/application/configs/application.ini"; //update application.ini - $newLines = "resources.frontController.moduleDirectory = APPLICATION_PATH '/modules'\n". - "resources.frontController.plugins.putHandler = 'Zend_Controller_Plugin_PutHandler'\n". + $iniFile = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."application.ini" : "/usr/share/airtime/application/configs/application.ini"; + + $newLines = "resources.frontController.moduleDirectory = APPLICATION_PATH \"/modules\"\n". + "resources.frontController.plugins.putHandler = \"Zend_Controller_Plugin_PutHandler\"\n". ";load everything in the modules directory including models\n". - "resources.modules[] = ''\n"; + "resources.modules[] = \"\"\n"; $currentIniFile = file_get_contents($iniFile); @@ -73,7 +64,8 @@ class UpgradeController extends Zend_Controller_Action } $file = new SplFileObject($iniFile, "w"); $file->fwrite($beginning."\n".$newLines.$end); - + + //delete maintenance.txt to give users access back to Airtime unlink($maintenanceFile); @@ -81,6 +73,19 @@ class UpgradeController extends Zend_Controller_Action $con->commit(); + //update system_version in cc_pref and change some columns in cc_files + $airtimeConf = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf"; + $values = parse_ini_file($airtimeConf, true); + + $username = $values['database']['dbuser']; + $password = $values['database']['dbpass']; + $host = $values['database']['host']; + $database = $values['database']['dbname']; + $dir = __DIR__; + + passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_$airtime_upgrade_version/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\""); + + $this->getResponse() ->setHttpResponseCode(200) ->appendBody("Upgrade to Airtime 2.5.3 OK"); diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php index 5e8754ec5..0174d14f0 100644 --- a/install_minimal/include/airtime-upgrade.php +++ b/install_minimal/include/airtime-upgrade.php @@ -65,8 +65,10 @@ if ($return_code == 0) { exit(1); } -// Stop media-monitor -service media-monitor stop-with-monit +// Stop media-monitor and disable it -- Airtime 2.5.3+ +@exec("service media-monitor stop-with-monit"); +@exec("rm /etc/init.d/airtime-media-monitor"); + //convert strings like 1.9.0-devel to 1.9.0 $version = substr($version, 0, 5);