CC-2271 1.8.2 code cleanup tasks
missing global, removing configs that don't exist yet.
This commit is contained in:
parent
11e54bf960
commit
c1c567bb91
|
@ -88,8 +88,8 @@ function LoadConfig($CC_CONFIG) {
|
||||||
$CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
|
$CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
|
||||||
$CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
|
$CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
|
||||||
|
|
||||||
$CC_CONFIG['baseUrl'] = $values['general']['base_url'];
|
//$CC_CONFIG['baseUrl'] = $values['general']['base_url'];
|
||||||
$CC_CONFIG['basePort'] = $values['general']['base_port'];
|
//$CC_CONFIG['basePort'] = $values['general']['base_port'];
|
||||||
|
|
||||||
$CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
|
$CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
|
||||||
// main directory for storing binary media files
|
// main directory for storing binary media files
|
||||||
|
@ -226,6 +226,7 @@ function InstallPhpCode()
|
||||||
|
|
||||||
function InstallBinaries()
|
function InstallBinaries()
|
||||||
{
|
{
|
||||||
|
global $AIRTIME_UTILS;
|
||||||
echo "* Installing binaries to ".CONF_DIR_BINARIES.PHP_EOL;
|
echo "* Installing binaries to ".CONF_DIR_BINARIES.PHP_EOL;
|
||||||
exec("mkdir -p ".CONF_DIR_BINARIES);
|
exec("mkdir -p ".CONF_DIR_BINARIES);
|
||||||
exec("cp -R ".$AIRTIME_UTILS." ".CONF_DIR_BINARIES);
|
exec("cp -R ".$AIRTIME_UTILS." ".CONF_DIR_BINARIES);
|
||||||
|
|
Loading…
Reference in New Issue