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

CC-2566: Separate URL config out of config files and put them with API_CLIENT

Browse source 
-fixed
This commit is contained in:
martin 2011-07-19 19:35:39 -04:00
parent 19a549df12
commit 6205b30152
9 changed files with 132 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

4
install_minimal/include/AirtimeIni.php
View file

@ -202,9 +202,7 @@ class AirtimeIni
$api_key = AirtimeIni::GenerateRandomString();
AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_AIRTIME, 'api_key', $api_key);
AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_AIRTIME, 'airtime_dir', AirtimeInstall::CONF_DIR_WWW);
AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_PYPO, 'api_key', "'$api_key'");
AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_RECORDER, 'api_key', "'$api_key'");
AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_MEDIAMONITOR, 'api_key', "'$api_key'");
AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_API_CLIENT, 'api_key', "'$api_key'");
}
public static function ReadPythonConfig($p_filename)

2
install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
View file

@ -568,8 +568,6 @@ class Airtime190Upgrade{
echo "Could not copy media-monitor.cfg to /etc/airtime/. Exiting.";
}
AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_MEDIAMONITOR, "api_key", $values["general"]["api_key"]);
echo "Reorganizing files in stor directory".PHP_EOL;
$cwd = __DIR__;