Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflict

This commit is contained in:
drigato 2014-11-27 15:46:39 -05:00
parent 2f9382679a
commit 8601452c71
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
airtime_mvc/application/configs/conf.php
View File

@ -25,16 +25,11 @@ class Config {
$filename = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf"; $filename = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf";
} }
// Parse separate conf file for Amazon S3 values // Parse separate conf file for cloud storage values
$amazonFilename = isset($_SERVER['AMAZONS3_CONF']) ? $_SERVER['AMAZONS3_CONF'] : "/etc/airtime-saas/amazon.conf"; $cloudStorageConfig = isset($_SERVER['CLOUD_STORAGE_CONF']) ? $_SERVER['CLOUD_STORAGE_CONF'] : "/etc/airtime-saas/cloud_storage.conf";
try { $cloudStorageValues = parse_ini_file($cloudStorageConfig, true);
$amazonValues = parse_ini_file($amazonFilename, true); $currentStorageBackend = $cloudStorageValues['current_backend']['storage_backend'];
} catch (ErrorException $e) { $CC_CONFIG['storage_backend'] = $cloudStorageValues[$currentStorageBackend];
//This file gets loaded before the Zend bootstrap even runs so our exception handlers aren't installed yet.
//Just die with an error here then instead or handling the error any other way.
die("Error: Invalid or missing $amazonFilename.");
}
$CC_CONFIG['cloud_storage'] = $amazonValues['cloud_storage'];
$values = parse_ini_file($filename, true); $values = parse_ini_file($filename, true);