diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php index e45f0591a..b98086956 100644 --- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php @@ -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); diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php index a3245522b..aa82ca0b2 100644 --- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php @@ -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'; diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php index c19234d65..3096e374f 100644 --- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php @@ -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';