Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

This commit is contained in:
drigato 2014-04-16 17:24:56 -04:00
commit cd6c4f7ede
5 changed files with 27 additions and 23 deletions

View file

@ -18,7 +18,7 @@ class UpgradeController extends Zend_Controller_Action
}
//Begin upgrade
$filename = "/etc/airtime/airtime.conf";
$filename = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf";
$values = parse_ini_file($filename, true);
$username = $values['database']['dbuser'];