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

Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1

This commit is contained in:
martin 2011-08-22 20:19:49 -04:00
parent ca65c32e1c 9547410bb0
commit e5579228bd
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install_minimal/include/airtime-upgrade.php
View File

@ -66,6 +66,9 @@ if (strcmp($version, "1.8.2") < 0){
if (strcmp($version, "1.9.0") < 0){ if (strcmp($version, "1.9.0") < 0){
system("php ".__DIR__."/../upgrades/airtime-1.9.0/airtime-upgrade.php"); system("php ".__DIR__."/../upgrades/airtime-1.9.0/airtime-upgrade.php");
} }
if (strcmp($version, "1.9.2") < 0){
system("php ".__DIR__."/../upgrades/airtime-1.9.2/airtime-upgrade.php");
}
//set the new version in the database. //set the new version in the database.

49
install_minimal/upgrades/airtime-1.9.2/airtime-upgrade.php
View File

@ -13,7 +13,7 @@
} }
class AirtimeIni{ class AirtimeIni192{
const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf"; const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf";
const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg"; const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg";
@ -79,30 +79,33 @@
foreach ($configFiles as $conf) { foreach ($configFiles as $conf) {
if (file_exists("$conf$suffix.bak")) { if (file_exists("$conf$suffix.bak")) {
if($conf === AirtimeIni::CONF_FILE_AIRTIME) { if($conf === AirtimeIni192::CONF_FILE_AIRTIME) {
// Parse with sections // Parse with sections
$newSettings = parse_ini_file($conf, true); $newSettings = parse_ini_file($conf, true);
$oldSettings = parse_ini_file("$conf$suffix.bak", true); $oldSettings = parse_ini_file("$conf$suffix.bak", true);
} }
else { else {
$newSettings = AirtimeIni::ReadPythonConfig($conf); $newSettings = AirtimeIni192::ReadPythonConfig($conf);
$oldSettings = AirtimeIni::ReadPythonConfig("$conf$suffix.bak"); $oldSettings = AirtimeIni192::ReadPythonConfig("$conf$suffix.bak");
} }
$settings = array_keys($newSettings); $settings = array_keys($newSettings);
foreach($settings as $section) { foreach($settings as $section) {
// skip airtim_dir as we want to use new value
if(isset($oldSettings[$section])) { if(isset($oldSettings[$section])) {
if(is_array($oldSettings[$section])) { if(is_array($oldSettings[$section])) {
$sectionKeys = array_keys($newSettings[$section]); $sectionKeys = array_keys($newSettings[$section]);
foreach($sectionKeys as $sectionKey) { foreach($sectionKeys as $sectionKey) {
if($sectionKey != "airtime_dir"){
if(isset($oldSettings[$section][$sectionKey])) { if(isset($oldSettings[$section][$sectionKey])) {
AirtimeIni::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]); AirtimeIni192::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]);
}
} }
} }
} }
else { else {
AirtimeIni::UpdateIniValue($conf, $section, $oldSettings[$section]); AirtimeIni192::UpdateIniValue($conf, $section, $oldSettings[$section]);
} }
} }
} }
@ -112,10 +115,10 @@
public static function upgradeConfigFiles(){ public static function upgradeConfigFiles(){
$configFiles = array(AirtimeIni::CONF_FILE_AIRTIME, $configFiles = array(AirtimeIni192::CONF_FILE_AIRTIME,
AirtimeIni::CONF_FILE_PYPO, AirtimeIni192::CONF_FILE_PYPO,
AirtimeIni::CONF_FILE_RECORDER, AirtimeIni192::CONF_FILE_RECORDER,
AirtimeIni::CONF_FILE_LIQUIDSOAP); AirtimeIni192::CONF_FILE_LIQUIDSOAP);
// Backup the config files // Backup the config files
$suffix = date("Ymdhis")."-1.9.0"; $suffix = date("Ymdhis")."-1.9.0";
@ -127,8 +130,8 @@
} }
$default_suffix = "192"; $default_suffix = "192";
AirtimeIni::CreateIniFiles($default_suffix); AirtimeIni192::CreateIniFiles($default_suffix);
AirtimeIni::MergeConfigFiles($configFiles, $suffix); AirtimeIni192::MergeConfigFiles($configFiles, $suffix);
} }
/** /**
@ -144,28 +147,38 @@
} }
} }
if (!copy(__DIR__."/airtime.conf.$suffix", AirtimeIni::CONF_FILE_AIRTIME)){ if (!copy(__DIR__."/airtime.conf.$suffix", AirtimeIni192::CONF_FILE_AIRTIME)){
echo "Could not copy airtime.conf to /etc/airtime/. Exiting."; echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
exit(1); exit(1);
} }
if (!copy(__DIR__."/pypo.cfg.$suffix", AirtimeIni::CONF_FILE_PYPO)){ if (!copy(__DIR__."/pypo.cfg.$suffix", AirtimeIni192::CONF_FILE_PYPO)){
echo "Could not copy pypo.cfg to /etc/airtime/. Exiting."; echo "Could not copy pypo.cfg to /etc/airtime/. Exiting.";
exit(1); exit(1);
} }
if (!copy(__DIR__."/recorder.cfg.$suffix", AirtimeIni::CONF_FILE_RECORDER)){ if (!copy(__DIR__."/recorder.cfg.$suffix", AirtimeIni192::CONF_FILE_RECORDER)){
echo "Could not copy recorder.cfg to /etc/airtime/. Exiting."; echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
exit(1); exit(1);
} }
if (!copy(__DIR__."/liquidsoap.cfg.$suffix", AirtimeIni::CONF_FILE_LIQUIDSOAP)){ if (!copy(__DIR__."/liquidsoap.cfg.$suffix", AirtimeIni192::CONF_FILE_LIQUIDSOAP)){
echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting."; echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
exit(1); exit(1);
} }
} }
} }
AirtimeIni::upgradeConfigFiles(); // change site-available/airtime and restart apache
echo "* Reconfiguring Apache\n";
exec("find /etc/apache2/sites-available/ -name '*' -type f -exec sed -i 's/\/var\/www\/airtime\/public/\/usr\/share\/airtime\/public/g' '{}' \;");
exec("service apache2 restart");
$values = parse_ini_file(AirtimeIni::CONF_FILE_AIRTIME, true); echo "* Updating configFiles\n";
AirtimeIni192::upgradeConfigFiles();
// delete files in /var/www/airtime
echo "* Deleting old PHP codes\n";
exec("rm -rf /var/www/airtime");
$values = parse_ini_file(AirtimeIni192::CONF_FILE_AIRTIME, true);
$phpDir = $values['general']['airtime_dir']; $phpDir = $values['general']['airtime_dir'];
Airtime192Upgrade::InstallAirtimePhpServerCode($phpDir); Airtime192Upgrade::InstallAirtimePhpServerCode($phpDir);
?> ?>