diff --git a/install_minimal/upgrades/airtime-1.7.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.7.0/airtime-upgrade.php deleted file mode 100644 index f43e416f7..000000000 --- a/install_minimal/upgrades/airtime-1.7.0/airtime-upgrade.php +++ /dev/null @@ -1,56 +0,0 @@ - $values['general']['web_server_user'], - - 'rabbitmq' => $values['rabbitmq'], - - 'baseFilesDir' => $values['general']['base_files_dir'], - // main directory for storing binary media files - 'storageDir' => $values['general']['base_files_dir']."/stor", - - // Database config - 'dsn' => array( - 'username' => $values['database']['dbuser'], - 'password' => $values['database']['dbpass'], - 'hostspec' => $values['database']['host'], - 'phptype' => 'pgsql', - 'database' => $values['database']['dbname']), - - // prefix for table names in the database - 'tblNamePrefix' => 'cc_', - - /* ================================================ storage configuration */ - - 'apiKey' => array($values['general']['api_key']), - 'apiPath' => '/api/', - - 'soundcloud-client-id' => '2CLCxcSXYzx7QhhPVHN4A', - 'soundcloud-client-secret' => 'pZ7beWmF06epXLHVUP1ufOg2oEnIt9XhE8l8xt0bBs', - - 'soundcloud-connection-retries' => $values['soundcloud']['connection_retries'], - 'soundcloud-connection-wait' => $values['soundcloud']['time_between_retries'], - - "rootDir" => __DIR__."/../.." -); - -AirtimeInstall::DbConnect(true); -$con = Propel::getConnection(); - -echo PHP_EOL."*** Updating Database Tables ***".PHP_EOL; - -if(AirtimeInstall::DbTableExists('doctrine_migration_versions') === false) { - $migrations = array('20110312121200', '20110331111708', '20110402164819'); - foreach($migrations as $migration) { - AirtimeInstall::BypassMigrations(__DIR__, $migration); - } -} -AirtimeInstall::MigrateTablesToVersion(__DIR__, '20110406182005'); - -//setting data for new aggregate show length column. -$sql = "SELECT id FROM cc_show_instances"; -$show_instances = $con->query($sql)->fetchAll(); - -foreach ($show_instances as $show_instance) { - $sql = "UPDATE cc_show_instances SET time_filled = (SELECT SUM(clip_length) FROM cc_schedule WHERE instance_id = {$show_instance["id"]}) WHERE id = {$show_instance["id"]}"; - $con->exec($sql); -} -//end setting data for new aggregate show length column. - -exec("rm -fr /opt/pypo"); -exec("rm -fr /opt/recorder"); - -const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf"; -const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg"; -const CONF_FILE_RECORDER = "/etc/airtime/recorder.cfg"; -const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg"; - -$configFiles = array(CONF_FILE_AIRTIME, - CONF_FILE_PYPO, - CONF_FILE_RECORDER, - CONF_FILE_LIQUIDSOAP); - - -/** -* This function creates the /etc/airtime configuration folder -* and copies the default config files to it. -*/ -function CreateIniFiles($suffix) -{ - if (!file_exists("/etc/airtime/")){ - if (!mkdir("/etc/airtime/", 0755, true)){ - echo "Could not create /etc/airtime/ directory. Exiting."; - exit(1); - } - } - - if (!copy(__DIR__."/airtime.conf.$suffix", CONF_FILE_AIRTIME)){ - echo "Could not copy airtime.conf.$suffix to /etc/airtime/. Exiting."; - exit(1); - } - if (!copy(__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){ - echo "Could not copy pypo.cfg.$suffix to /etc/airtime/. Exiting."; - exit(1); - } - if (!copy(__DIR__."/recorder.cfg.$suffix", CONF_FILE_RECORDER)){ - echo "Could not copy recorder.cfg.$suffix to /etc/airtime/. Exiting."; - exit(1); - } - if (!copy(__DIR__."/liquidsoap.cfg.$suffix", CONF_FILE_LIQUIDSOAP)){ - echo "Could not copy liquidsoap.cfg.$suffix to /etc/airtime/. Exiting."; - exit(1); - } -} - -function ReadPythonConfig($p_filename) -{ - $values = array(); - - $lines = file($p_filename); - $n=count($lines); - for ($i=0; $i<$n; $i++) { - if (strlen($lines[$i]) && !in_array(substr($lines[$i], 0, 1), array('#', PHP_EOL))){ - $info = explode("=", $lines[$i]); - $values[trim($info[0])] = trim($info[1]); - } - } - - return $values; -} - -function UpdateIniValue($p_filename, $p_property, $p_value) -{ - $lines = file($p_filename); - $n=count($lines); - foreach ($lines as &$line) { - if ($line[0] != "#"){ - $key_value = split("=", $line); - $key = trim($key_value[0]); - - if ($key == $p_property){ - $line = "$p_property = $p_value".PHP_EOL; - } - } - } - - $fp=fopen($p_filename, 'w'); - for($i=0; $i<$n; $i++){ - fwrite($fp, $lines[$i]); - } - fclose($fp); -} - -function MergeConfigFiles($configFiles, $suffix) -{ - foreach ($configFiles as $conf) { - if (file_exists("$conf$suffix.bak")) { - - if($conf === CONF_FILE_AIRTIME) { - // Parse with sections - $newSettings = parse_ini_file($conf, true); - $oldSettings = parse_ini_file("$conf$suffix.bak", true); - - $oldSettings['general']['airtime_dir'] = '/var/www/airtime'; - $oldSettings['general']['base_files_dir'] = '/srv/airtime'; - } - else { - $newSettings = ReadPythonConfig($conf); - $oldSettings = ReadPythonConfig("$conf$suffix.bak"); - } - - //override some values needed for 1.8.0. - if($conf === CONF_FILE_PYPO) { - - $oldSettings['cache_dir'] = '/var/tmp/airtime/pypo/cache/'; - $oldSettings['file_dir'] = '/var/tmp/airtime/pypo/files/'; - $oldSettings['tmp_dir'] = '/var/tmp/airtime/pypo/tmp/'; - } - else if($conf === CONF_FILE_RECORDER) { - - $oldSettings['base_recorded_files'] = '/var/tmp/airtime/show-recorder/'; - } - - $settings = array_keys($newSettings); - - foreach($settings as $section) { - if(isset($oldSettings[$section])) { - if(is_array($oldSettings[$section])) { - $sectionKeys = array_keys($newSettings[$section]); - foreach($sectionKeys as $sectionKey) { - if(isset($oldSettings[$section][$sectionKey])) { - UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]); - } - } - } - else { - UpdateIniValue($conf, $section, $oldSettings[$section]); - } - } - } - } - } -} - -function LoadConfig($CC_CONFIG) { - $values = parse_ini_file(CONF_FILE_AIRTIME, true); - - // Name of the web server user - $CC_CONFIG['webServerUser'] = $values['general']['web_server_user']; - $CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; - $CC_CONFIG['rabbitmq'] = $values['rabbitmq']; - - $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir']; - // main directory for storing binary media files - $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor"; - - // Database config - $CC_CONFIG['dsn']['username'] = $values['database']['dbuser']; - $CC_CONFIG['dsn']['password'] = $values['database']['dbpass']; - $CC_CONFIG['dsn']['hostspec'] = $values['database']['host']; - $CC_CONFIG['dsn']['phptype'] = 'pgsql'; - $CC_CONFIG['dsn']['database'] = $values['database']['dbname']; - - $CC_CONFIG['apiKey'] = array($values['general']['api_key']); - - $CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries']; - $CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries']; - - return $CC_CONFIG; -} - -function movePhpFiles($CC_CONFIG){ - $phpDir = $CC_CONFIG['phpDir']; - echo "Copying Server files from $phpDir/airtime_mvc to /var/www/airtime"; - exec("mkdir -p /var/www/airtime"); - exec("cp -R $phpDir/airtime_mvc/* /var/www/airtime"); -} - -// Backup the config files -$suffix = date("Ymdhis")."-1.8.0"; -foreach ($configFiles as $conf) { - if (file_exists($conf)) { - echo "Backing up $conf to $conf$suffix.bak".PHP_EOL; - exec("cp $conf $conf$suffix.bak"); - } -} - - -$CC_CONFIG = LoadConfig($CC_CONFIG); -movePhpFiles($CC_CONFIG); - -$default_suffix = "180"; -CreateIniFiles($default_suffix); -echo "* Initializing INI files".PHP_EOL; - - -MergeConfigFiles($configFiles, $suffix); - - - diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime.conf.180 b/install_minimal/upgrades/airtime-1.8.0/airtime.conf.180 deleted file mode 100644 index 9135f09e4..000000000 --- a/install_minimal/upgrades/airtime-1.8.0/airtime.conf.180 +++ /dev/null @@ -1,22 +0,0 @@ -[database] -host = localhost -dbname = airtime -dbuser = airtime -dbpass = airtime - -[rabbitmq] -host = 127.0.0.1 -port = 5672 -user = guest -password = guest -vhost = / - -[general] -api_key = AAA -web_server_user = www-data -airtime_dir = x -base_files_dir = x - -[soundcloud] -connection_retries = 3 -time_between_retries = 60 diff --git a/install_minimal/upgrades/airtime-1.8.0/liquidsoap.cfg.180 b/install_minimal/upgrades/airtime-1.8.0/liquidsoap.cfg.180 deleted file mode 100644 index 360ee107f..000000000 --- a/install_minimal/upgrades/airtime-1.8.0/liquidsoap.cfg.180 +++ /dev/null @@ -1,38 +0,0 @@ -########################################### -# liquidsoap config file # -########################################### - - -########################################### -# general settings # -########################################### - -log_file = "/var/log/airtime/pypo-liquidsoap/