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

Merge branch 'master' of dev.sourcefabric.org:campcaster

Browse source
This commit is contained in:
naomiaro 2011-04-01 18:18:59 -04:00
commit 8f8bd68849
7 changed files with 43 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
application/configs/conf.php
View file

@ -6,7 +6,7 @@
* /etc/airtime/recorder.cfg
*/
define('AIRTIME_VERSION', '1.7.0-alpha');
define('AIRTIME_VERSION', '1.7.0-beta');
define('AIRTIME_COPYRIGHT_DATE', '2010-2011');
define('AIRTIME_REST_VERSION', '1.1');
@ -16,13 +16,13 @@ $values = load_airtime_config();
$CC_CONFIG = array(
// Name of the web server user
'webServerUser' => $values['general']['webServerUser'],
'webServerUser' => $values['general']['web_server_user'],
'rabbitmq' => $values['rabbitmq'],
'baseFilesDir' => $values['general']['baseFilesDir'],
'baseFilesDir' => $values['general']['base_files_dir'],
// main directory for storing binary media files
'storageDir' => $values['general']['baseFilesDir']."/stor",
'storageDir' => $values['general']['base_files_dir']."/stor",
// Database config
'dsn' => array(