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

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

Browse source
This commit is contained in:
drigato 2014-11-11 16:30:50 -05:00
commit 10db978a2b
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/configs/conf.php
View file

@ -26,7 +26,7 @@ class Config {
}
// Parse separate conf file for Amazon S3 values
$amazonFilename = "/etc/airtime-saas/amazon.conf";
$amazonFilename = isset($_SERVER['AMAZONS3_CONF']) ? $_SERVER['AMAZONS3_CONF'] : "/etc/airtime-saas/amazon.conf";
$amazonValues = parse_ini_file($amazonFilename, true);
$CC_CONFIG['cloud_storage'] = $amazonValues['cloud_storage'];