CC-2621 : Support upgrades from 1.7.0
This commit is contained in:
parent
634bb9bcd5
commit
7e0684cb6d
3 changed files with 48 additions and 25 deletions
|
@ -7,20 +7,58 @@
|
|||
*/
|
||||
|
||||
set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
|
||||
require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php';
|
||||
//require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php';
|
||||
require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
|
||||
require_once(dirname(__FILE__).'/../../include/AirtimeIni.php');
|
||||
|
||||
//global $AIRTIME_SRC;
|
||||
//global $AIRTIME_UTILS;
|
||||
global $AIRTIME_PYTHON_APPS;
|
||||
|
||||
global $CC_CONFIG;
|
||||
|
||||
//$AIRTIME_SRC = __DIR__.'/../../../airtime_mvc';
|
||||
//$AIRTIME_UTILS = __DIR__.'/../../../utils';
|
||||
$AIRTIME_PYTHON_APPS = __DIR__.'/../../../python_apps';
|
||||
function load_airtime_config(){
|
||||
$ini_array = parse_ini_file('/etc/airtime/airtime.conf', true);
|
||||
return $ini_array;
|
||||
}
|
||||
|
||||
$values = load_airtime_config();
|
||||
|
||||
$CC_CONFIG = array(
|
||||
|
||||
// Name of the web server user
|
||||
'webServerUser' => $values['general']['web_server_user'],
|
||||
|
||||
'rabbitmq' => $values['rabbitmq'],
|
||||
|
||||
'baseFilesDir' => $values['general']['base_files_dir'],
|
||||
// main directory for storing binary media files
|
||||
'storageDir' => $values['general']['base_files_dir']."/stor",
|
||||
|
||||
// Database config
|
||||
'dsn' => array(
|
||||
'username' => $values['database']['dbuser'],
|
||||
'password' => $values['database']['dbpass'],
|
||||
'hostspec' => $values['database']['host'],
|
||||
'phptype' => 'pgsql',
|
||||
'database' => $values['database']['dbname']),
|
||||
|
||||
// prefix for table names in the database
|
||||
'tblNamePrefix' => 'cc_',
|
||||
|
||||
/* ================================================ storage configuration */
|
||||
|
||||
'apiKey' => array($values['general']['api_key']),
|
||||
'apiPath' => '/api/',
|
||||
|
||||
'soundcloud-client-id' => '2CLCxcSXYzx7QhhPVHN4A',
|
||||
'soundcloud-client-secret' => 'pZ7beWmF06epXLHVUP1ufOg2oEnIt9XhE8l8xt0bBs',
|
||||
|
||||
'soundcloud-connection-retries' => $values['soundcloud']['connection_retries'],
|
||||
'soundcloud-connection-wait' => $values['soundcloud']['time_between_retries'],
|
||||
|
||||
"rootDir" => __DIR__."/../..",
|
||||
'pearPath' => dirname(__FILE__).'/../../library/pear',
|
||||
'zendPath' => dirname(__FILE__).'/../../library/Zend',
|
||||
'phingPath' => dirname(__FILE__).'/../../library/phing',
|
||||
|
||||
);
|
||||
|
||||
AirtimeInstall::DbConnect(true);
|
||||
|
||||
|
|
|
@ -18,16 +18,8 @@ const CONF_DIR_STORAGE = "/srv/airtime";
|
|||
const CONF_DIR_WWW = "/var/www/airtime";
|
||||
const CONF_DIR_LOG = "/var/log/airtime";
|
||||
|
||||
global $AIRTIME_SRC;
|
||||
global $AIRTIME_UTILS;
|
||||
global $AIRTIME_PYTHON_APPS;
|
||||
|
||||
global $CC_CONFIG;
|
||||
|
||||
$AIRTIME_SRC = __DIR__.'/../../../airtime_mvc';
|
||||
$AIRTIME_UTILS = __DIR__.'/../../../utils';
|
||||
$AIRTIME_PYTHON_APPS = __DIR__.'/../../../python_apps';
|
||||
|
||||
$configFiles = array(CONF_FILE_AIRTIME,
|
||||
CONF_FILE_PYPO,
|
||||
CONF_FILE_RECORDER,
|
||||
|
@ -48,7 +40,7 @@ $CC_CONFIG = array(
|
|||
'phingPath' => dirname(__FILE__).'/../../library/phing'
|
||||
);
|
||||
|
||||
//$CC_CONFIG = Config::loadConfig($CC_CONFIG);
|
||||
$CC_CONFIG = LoadConfig($CC_CONFIG);
|
||||
|
||||
// Add database table names
|
||||
$CC_CONFIG['playListTable'] = $CC_CONFIG['tblNamePrefix'].'playlist';
|
||||
|
|
|
@ -18,16 +18,9 @@ const CONF_DIR_STORAGE = "/srv/airtime";
|
|||
const CONF_DIR_WWW = "/var/www/airtime";
|
||||
const CONF_DIR_LOG = "/var/log/airtime";
|
||||
|
||||
global $AIRTIME_SRC;
|
||||
global $AIRTIME_UTILS;
|
||||
global $AIRTIME_PYTHON_APPS;
|
||||
|
||||
global $CC_CONFIG;
|
||||
|
||||
$AIRTIME_SRC = __DIR__.'/../../../airtime_mvc';
|
||||
$AIRTIME_UTILS = __DIR__.'/../../../utils';
|
||||
$AIRTIME_PYTHON_APPS = __DIR__.'/../../../python_apps';
|
||||
|
||||
$configFiles = array(CONF_FILE_AIRTIME,
|
||||
CONF_FILE_PYPO,
|
||||
CONF_FILE_RECORDER,
|
||||
|
@ -48,7 +41,7 @@ $CC_CONFIG = array(
|
|||
'phingPath' => dirname(__FILE__).'/../../library/phing'
|
||||
);
|
||||
|
||||
//$CC_CONFIG = Config::loadConfig($CC_CONFIG);
|
||||
$CC_CONFIG = LoadConfig($CC_CONFIG);
|
||||
|
||||
// Add database table names
|
||||
$CC_CONFIG['playListTable'] = $CC_CONFIG['tblNamePrefix'].'playlist';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue