CC-3805: After upgrade, incorrect values in airtime.conf
-fixed
This commit is contained in:
parent
ca4cbb0ce1
commit
cfb4c201ff
3 changed files with 6 additions and 9 deletions
|
@ -4,7 +4,7 @@ set_include_path(__DIR__.'/../../airtime_mvc/library' . PATH_SEPARATOR . get_inc
|
|||
if (file_exists('/usr/share/php/libzend-framework-php')){
|
||||
set_include_path('/usr/share/php/libzend-framework-php' . PATH_SEPARATOR . get_include_path());
|
||||
}
|
||||
require_once('Zend/Loader/Autoloader.php');
|
||||
#require_once('Zend/Loader/Autoloader.php');
|
||||
|
||||
class AirtimeInstall
|
||||
{
|
||||
|
|
|
@ -10,7 +10,7 @@ class AirtimeMiscUpgrade{
|
|||
public static function adjustAirtimeStorPermissions($p_ini){
|
||||
/* Make the read permission of Monit cfg files more strict */
|
||||
$webUser = $p_ini["general"]["web_server_user"];
|
||||
exec("chown -R root:$webUser");
|
||||
exec("chown -R root:$webUser /srv/airtime");
|
||||
exec("chmod -R 2775 /srv/airtime");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -162,15 +162,12 @@ class UpgradeCommon{
|
|||
if(is_array($oldSettings[$section])) {
|
||||
$sectionKeys = array_keys($newSettings[$section]);
|
||||
foreach($sectionKeys as $sectionKey) {
|
||||
// skip airtim_dir as we want to use new value
|
||||
if($sectionKey != "airtime_dir"){
|
||||
if(isset($oldSettings[$section][$sectionKey])) {
|
||||
self::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]);
|
||||
}
|
||||
|
||||
if(isset($oldSettings[$section][$sectionKey])) {
|
||||
self::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
self::UpdateIniValue($conf, $section, $oldSettings[$section]);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue