From 1d9310f6769f8c3b3970f8e2751496bd53130513 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Tue, 2 Aug 2011 11:51:29 +0200
Subject: [PATCH 01/26] CC-2621 : Support upgrades from 1.7.0

---
 .../airtime-1.8.0/airtime-upgrade.php         | 146 +++++++++++++++---
 1 file changed, 126 insertions(+), 20 deletions(-)

diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index 897555da6..5ab38b1ff 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -46,12 +46,6 @@ $configFiles = array(AirtimeIni::CONF_FILE_AIRTIME,
                      AirtimeIni::CONF_FILE_RECORDER,
                      AirtimeIni::CONF_FILE_LIQUIDSOAP);
 
-foreach ($configFiles as $conf) {
-    if (file_exists($conf)) {
-        echo "Backing up $conf to $conf.bak".PHP_EOL;
-        exec("cp $conf $conf.bak");
-    }
-}
 
 /**
 * This function creates the /etc/airtime configuration folder
@@ -86,22 +80,134 @@ function CreateIniFiles()
     }
 }
 
-echo "* Creating INI files".PHP_EOL;
+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);
+            }
+            else {
+                $newSettings = ReadPythonConfig($conf);
+                $oldSettings = ReadPythonConfig("$conf$suffix.bak");
+            }
+
+            $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'];
+
+    // 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;
+}
+
+// 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");
+    }
+}
+
 CreateIniFiles();
-
-AirtimeInstall::InstallPhpCode();
-AirtimeInstall::InstallBinaries();
-
 echo "* Initializing INI files".PHP_EOL;
-AirtimeIni::UpdateIniFiles();
-global $CC_CONFIG;
-$CC_CONFIG = Config::loadConfig($CC_CONFIG);
+MergeConfigFiles($configFiles, $suffix);
 
-echo "* Creating default storage directory".PHP_EOL;
-AirtimeInstall::InstallStorageDirectory();
+$CC_CONFIG = LoadConfig($CC_CONFIG);
 
-$ini = parse_ini_file(__DIR__."/../../include/airtime-install.ini");
-$stor_dir = $ini["storage_dir"];
+//echo "* Creating INI files".PHP_EOL;
+//CreateIniFiles();
 
-AirtimeInstall::ChangeDirOwnerToWebserver($stor_dir);
-AirtimeInstall::CreateSymlinksToUtils();
+//AirtimeInstall::InstallPhpCode();
+//AirtimeInstall::InstallBinaries();
+
+//echo "* Initializing INI files".PHP_EOL;
+//AirtimeIni::UpdateIniFiles();
+//global $CC_CONFIG;
+//$CC_CONFIG = Config::loadConfig($CC_CONFIG);
+
+//echo "* Creating default storage directory".PHP_EOL;
+//AirtimeInstall::InstallStorageDirectory();
+
+//$ini = parse_ini_file(__DIR__."/../../include/airtime-install.ini");
+//$stor_dir = $ini["storage_dir"];
+
+//AirtimeInstall::ChangeDirOwnerToWebserver($stor_dir);
+//AirtimeInstall::CreateSymlinksToUtils();

From ff41f8306e68b027caef7aec8b9115ff45324134 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Tue, 2 Aug 2011 12:31:25 +0200
Subject: [PATCH 02/26] CC-2621 : Support upgrades from 1.7.0

---
 .../airtime-1.8.0/airtime-upgrade.php         | 24 ++++---------------
 .../airtime-1.8.1/airtime-upgrade.php         |  4 ++++
 .../airtime-1.8.2/airtime-upgrade.php         |  4 ++++
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index 5ab38b1ff..c43b66047 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -162,6 +162,10 @@ function LoadConfig($CC_CONFIG) {
     $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'];
@@ -191,23 +195,3 @@ echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
 $CC_CONFIG = LoadConfig($CC_CONFIG);
-
-//echo "* Creating INI files".PHP_EOL;
-//CreateIniFiles();
-
-//AirtimeInstall::InstallPhpCode();
-//AirtimeInstall::InstallBinaries();
-
-//echo "* Initializing INI files".PHP_EOL;
-//AirtimeIni::UpdateIniFiles();
-//global $CC_CONFIG;
-//$CC_CONFIG = Config::loadConfig($CC_CONFIG);
-
-//echo "* Creating default storage directory".PHP_EOL;
-//AirtimeInstall::InstallStorageDirectory();
-
-//$ini = parse_ini_file(__DIR__."/../../include/airtime-install.ini");
-//$stor_dir = $ini["storage_dir"];
-
-//AirtimeInstall::ChangeDirOwnerToWebserver($stor_dir);
-//AirtimeInstall::CreateSymlinksToUtils();
diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
index c077e1c25..478262dde 100644
--- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
@@ -88,6 +88,10 @@ function LoadConfig($CC_CONFIG) {
     $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",
+
     //$CC_CONFIG['baseUrl'] = $values['general']['base_url'];
     //$CC_CONFIG['basePort'] = $values['general']['base_port'];
 
diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index 788db3e26..33107d79f 100644
--- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -88,6 +88,10 @@ function LoadConfig($CC_CONFIG) {
     $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",
+
     $CC_CONFIG['baseUrl'] = $values['general']['base_url'];
     $CC_CONFIG['basePort'] = $values['general']['base_port'];
 

From cc18a646684314c8fd84485686710d4341bff8c6 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Tue, 2 Aug 2011 12:56:39 +0200
Subject: [PATCH 03/26] CC-2621 : Support upgrades from 1.7.0

---
 install_minimal/include/AirtimeInstall.php                | 8 ++++++++
 install_minimal/include/airtime-install.php               | 2 +-
 install_minimal/include/airtime-upgrade.php               | 7 ++++++-
 .../upgrades/airtime-1.8.0/airtime-upgrade.php            | 4 ++--
 .../upgrades/airtime-1.8.1/airtime-upgrade.php            | 4 ++--
 .../upgrades/airtime-1.8.2/airtime-upgrade.php            | 4 ++--
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 60438e200..904cbe8f1 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -68,6 +68,14 @@ class AirtimeInstall
             if (PEAR::isError($version)) {
                 return null;
             }
+
+            $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
+            $result = $CC_DBC->GetOne($sql);
+            if (!PEAR::isError($result)) {
+                $version = "1.7.0";
+                //echo "Airtime Version: ".$version." ".PHP_EOL;
+            }
+
             // no version string detected
             if($version == ''){
                 $version = false;
diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php
index faaad8d0e..ff4f8d731 100644
--- a/install_minimal/include/airtime-install.php
+++ b/install_minimal/include/airtime-install.php
@@ -72,7 +72,7 @@ if (isset($version) && ($version != false) && ($version < AIRTIME_VERSION) && !i
 }
 
 if($version === false){
-    echo "A version of Airtime older than 1.8.0 detected, please upgrade to 1.8.0 first.\n";
+    echo "A version of Airtime older than 1.7.0 detected, please upgrade to 1.7.0 first.\n";
     echo "You will then be able to upgrade to 1.9.0 using this installer.\n";
     exit(3);
 }
diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index 856a1a57f..32c68ad33 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -12,6 +12,7 @@ set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . ge
 require_once('DB.php');
 require_once(__DIR__.'/../../airtime_mvc/application/configs/constants.php');
 require_once(dirname(__FILE__).'/AirtimeIni.php');
+require_once(dirname(__FILE__).'/AirtimeInstall.php');
 
 if(exec("whoami") != "root"){
     echo "Must be root user.\n";
@@ -43,6 +44,7 @@ if (PEAR::isError($CC_DBC)) {
     $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
 }
 
+/*
 $sql = "SELECT valstr FROM cc_pref WHERE keystr = 'system_version'";
 $version = $CC_DBC->GetOne($sql);
 
@@ -52,7 +54,7 @@ if (PEAR::isError($version)) {
 
 if (!$version){
 
-    $sql = "SELECT * FROM ".$p_name;
+    $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
     $result = $CC_DBC->GetOne($sql);
     if (!PEAR::isError($result)) {
         $version = "1.7.0";
@@ -63,6 +65,9 @@ if (!$version){
         echo "Airtime Version: ".$version." ".PHP_EOL;
     }
 }
+*/
+
+$version = AirtimeInstall::GetVersionInstalled();
 
 echo "******************************** Update Begin *********************************".PHP_EOL;
 
diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index c43b66047..d3f20807f 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -162,9 +162,9 @@ function LoadConfig($CC_CONFIG) {
     $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
     $CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
 
-    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'],
+    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
     // main directory for storing binary media files
-    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor",
+    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
 
     // Database config
     $CC_CONFIG['dsn']['username'] = $values['database']['dbuser'];
diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
index 478262dde..2b4764db2 100644
--- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
@@ -88,9 +88,9 @@ function LoadConfig($CC_CONFIG) {
     $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
     $CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
 
-    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'],
+    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
     // main directory for storing binary media files
-    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor",
+    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
 
     //$CC_CONFIG['baseUrl'] = $values['general']['base_url'];
     //$CC_CONFIG['basePort'] = $values['general']['base_port'];
diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index 33107d79f..0f88c22c3 100644
--- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -88,9 +88,9 @@ function LoadConfig($CC_CONFIG) {
     $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
     $CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
 
-    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'],
+    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
     // main directory for storing binary media files
-    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor",
+    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
 
     $CC_CONFIG['baseUrl'] = $values['general']['base_url'];
     $CC_CONFIG['basePort'] = $values['general']['base_port'];

From 923bd5d9b596f15d314538f06e2241a53e7bf5ea Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Tue, 2 Aug 2011 13:09:23 +0200
Subject: [PATCH 04/26] CC-2621 : Support upgrades from 1.7.0

---
 install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index d3f20807f..cdb90a5a5 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -62,7 +62,7 @@ function CreateIniFiles()
         }
     }
 
-    if (!copy("airtime.conf.180", CONF_FILE_AIRTIME)){
+    if (!copy(__DIR__."/airtime.conf.180", CONF_FILE_AIRTIME)){
         echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
         exit(1);
     }

From a4e5d0751000e4aba0f50bd93816668367f72794 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Tue, 2 Aug 2011 16:31:03 +0200
Subject: [PATCH 05/26] CC-2621 : Support upgrades from 1.7.0

---
 .../upgrades/airtime-1.8.0/airtime-upgrade.php        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index cdb90a5a5..29170d325 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -11,6 +11,17 @@ require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php';
 require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
 require_once(dirname(__FILE__).'/../../include/AirtimeIni.php');
 
+//global $AIRTIME_SRC;
+//global $AIRTIME_UTILS;
+global $AIRTIME_PYTHON_APPS;
+
+global $CC_CONFIG;
+
+//$AIRTIME_SRC = __DIR__.'/../../../airtime_mvc';
+//$AIRTIME_UTILS = __DIR__.'/../../../utils';
+$AIRTIME_PYTHON_APPS = __DIR__.'/../../../python_apps';
+
+
 AirtimeInstall::DbConnect(true);
 
 echo PHP_EOL."*** Updating Database Tables ***".PHP_EOL;

From 81bcd563609b0d11abaa818954b3f58d0d301a82 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Tue, 2 Aug 2011 18:14:46 +0200
Subject: [PATCH 06/26] CC-2621 : Support upgrades from 1.7.0

---
 .../upgrades/airtime-1.8.0/liquidsoap.cfg.180 |  38 +++++
 .../upgrades/airtime-1.8.0/pypo.cfg.180       | 139 ++++++++++++++++++
 .../upgrades/airtime-1.8.0/recorder.cfg.180   |  35 +++++
 .../upgrades/airtime-1.8.1/liquidsoap.cfg.181 |  38 +++++
 .../upgrades/airtime-1.8.1/pypo.cfg.181       | 139 ++++++++++++++++++
 .../upgrades/airtime-1.8.1/recorder.cfg.181   |  35 +++++
 .../upgrades/airtime-1.8.2/liquidsoap.cfg.182 |  46 ++++++
 .../upgrades/airtime-1.8.2/pypo.cfg.182       | 139 ++++++++++++++++++
 .../upgrades/airtime-1.8.2/recorder.cfg.182   |  35 +++++
 .../upgrades/airtime-1.9.0/liquidsoap.cfg.190 |  55 +++++++
 .../airtime-1.9.0/media-monitor.cfg.190       |  21 +++
 .../upgrades/airtime-1.9.0/pypo.cfg.190       |  72 +++++++++
 .../upgrades/airtime-1.9.0/recorder.cfg.190   |  26 ++++
 13 files changed, 818 insertions(+)
 create mode 100644 install_minimal/upgrades/airtime-1.8.0/liquidsoap.cfg.180
 create mode 100644 install_minimal/upgrades/airtime-1.8.0/pypo.cfg.180
 create mode 100644 install_minimal/upgrades/airtime-1.8.0/recorder.cfg.180
 create mode 100644 install_minimal/upgrades/airtime-1.8.1/liquidsoap.cfg.181
 create mode 100644 install_minimal/upgrades/airtime-1.8.1/pypo.cfg.181
 create mode 100644 install_minimal/upgrades/airtime-1.8.1/recorder.cfg.181
 create mode 100644 install_minimal/upgrades/airtime-1.8.2/liquidsoap.cfg.182
 create mode 100644 install_minimal/upgrades/airtime-1.8.2/pypo.cfg.182
 create mode 100644 install_minimal/upgrades/airtime-1.8.2/recorder.cfg.182
 create mode 100644 install_minimal/upgrades/airtime-1.9.0/liquidsoap.cfg.190
 create mode 100644 install_minimal/upgrades/airtime-1.9.0/media-monitor.cfg.190
 create mode 100644 install_minimal/upgrades/airtime-1.9.0/pypo.cfg.190
 create mode 100644 install_minimal/upgrades/airtime-1.9.0/recorder.cfg.190

diff --git a/install_minimal/upgrades/airtime-1.8.0/liquidsoap.cfg.180 b/install_minimal/upgrades/airtime-1.8.0/liquidsoap.cfg.180
new file mode 100644
index 000000000..360ee107f
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.8.0/liquidsoap.cfg.180
@@ -0,0 +1,38 @@
+###########################################
+# liquidsoap config file                  #
+###########################################
+
+
+###########################################
+# general settings                        #
+###########################################
+
+log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"
+log_level = 3
+
+###########################################
+# stream settings                         #
+###########################################
+icecast_host = "127.0.0.1"
+icecast_port = 8000
+icecast_pass = "hackme"
+
+###########################################
+# webstream mountpoint names              #
+###########################################
+mount_point_mp3 = "airtime.mp3"
+mount_point_vorbis = "airtime.ogg"
+
+###########################################
+# webstream metadata settings             #
+###########################################
+icecast_url = "http://airtime.sourcefabric.org"
+icecast_description = "Airtime Radio!"
+icecast_genre = "genre"
+
+###########################################
+#liquidsoap output settings              #
+###########################################
+output_sound_device = false
+output_icecast_vorbis = true
+output_icecast_mp3 = false
diff --git a/install_minimal/upgrades/airtime-1.8.0/pypo.cfg.180 b/install_minimal/upgrades/airtime-1.8.0/pypo.cfg.180
new file mode 100644
index 000000000..e2ab6fead
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.8.0/pypo.cfg.180
@@ -0,0 +1,139 @@
+############################################
+# pypo - configuration                     #
+############################################
+
+# Set the type of client you are using.
+# Currently supported types:
+# 1) "obp" = Open Broadcast Platform
+# 2) "airtime"
+#
+api_client = "airtime"
+
+############################################
+# Cache Directories                        #
+# *include* trailing slash !!              #
+############################################
+cache_dir = '/var/tmp/airtime/pypo/cache/'
+file_dir = '/var/tmp/airtime/pypo/files/' 
+tmp_dir = '/var/tmp/airtime/pypo/tmp/'
+
+############################################
+# Setup Directories                        #
+# Do *not* include trailing slash !!         #
+############################################
+cache_base_dir = '/var/tmp/airtime/pypo'
+bin_dir = '/usr/lib/airtime/pypo'
+log_base_dir = '/var/log/airtime'
+pypo_log_dir = '/var/log/airtime/pypo'
+liquidsoap_log_dir = '/var/log/airtime/pypo-liquidsoap'
+
+# Hostname
+base_url = 'localhost'
+base_port = 80
+
+############################################
+# Liquidsoap settings                      #
+############################################
+ls_host = '127.0.0.1'
+ls_port = '1234'
+
+############################################
+# RabbitMQ settings                        #
+############################################
+rabbitmq_host = 'localhost'
+rabbitmq_user = 'guest'
+rabbitmq_password = 'guest'
+
+############################################
+# pypo preferences                         #
+############################################
+prepare_ahead = 24 #in hours
+cache_for = 24 #how long to hold the cache, in hours
+
+# Poll interval in seconds.
+#
+# This will rarely need to be changed because any schedule changes are 
+# automatically sent to pypo immediately. 
+#
+# This is how often the poll script downloads new schedules and files from the
+# server in the event that no changes are made to the schedule.
+#
+poll_interval = 3600 # in seconds.
+
+
+# Push interval in seconds.
+#
+# This is how often the push script checks whether it has something new to
+# push to liquidsoap.
+#
+# It's hard to imagine a situation where this should be more than 1 second.
+#
+push_interval = 1 # in seconds
+
+# 'pre' or 'otf'. 'pre' cues while playlist preparation
+# while 'otf' (on the fly) cues while loading into ls  
+# (needs the post_processor patch)
+cue_style = 'pre'
+
+
+################################################################################
+# Uncomment *one of the sets* of values from the API clients below, and comment
+# out all the others.
+################################################################################
+
+#####################
+# Airtime Config #
+#####################
+# Value needed to access the API
+api_key = 'AAA'
+
+# Path to the base of the API
+api_base = 'api'
+
+# URL to get the version number of the server API
+version_url = 'version/api_key/%%api_key%%'
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+export_url = 'schedule/api_key/%%api_key%%'
+
+get_media_url = 'get-media/file/%%file%%/api_key/%%api_key%%'
+
+# Update whether a schedule group has begun playing.
+update_item_url = 'notify-schedule-group-play/api_key/%%api_key%%/schedule_id/%%schedule_id%%'
+
+# Update whether an audio clip is currently playing.
+update_start_playing_url = 'notify-media-item-start-play/api_key/%%api_key%%/media_id/%%media_id%%/schedule_id/%%schedule_id%%'
+
+# ???
+generate_range_url = 'generate_range_dp.php'
+
+
+##############
+# OBP config #
+##############
+# Value needed to access the API
+#api_key = 'AAA'
+
+#base_url = 'http://localhost/'
+
+# Path to the base of the API
+#api_base = ''
+
+# URL to get the version number of the server API
+#version_url = 'api/pypo/status/json'
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+
+# Update whether an item has been played.
+#update_item_url = 'api/pypo/update_shedueled_item/$$item_id%%?played=%%played%%' 
+
+# Update whether an item is currently playing.
+#update_start_playing_url = 'api/pypo/mod/medialibrary/?playlist_type=%%playlist_type%%&export_source=%%export_source%%&media_id=%%media_id%%&playlist_id=%%playlist_id%%&transmission_id=%%transmission_id%%'
+
+# ???
+#generate_range_url = 'api/pypo/generate_range_dp/'
+
diff --git a/install_minimal/upgrades/airtime-1.8.0/recorder.cfg.180 b/install_minimal/upgrades/airtime-1.8.0/recorder.cfg.180
new file mode 100644
index 000000000..22fcd227c
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.8.0/recorder.cfg.180
@@ -0,0 +1,35 @@
+api_client = "airtime"
+
+# Hostname
+base_url = 'localhost'
+base_port = 80
+
+# where the binary files live
+bin_dir = '/usr/lib/airtime/show-recorder'
+
+# base path to store recordered shows at
+base_recorded_files = '/var/tmp/airtime/show-recorder/'
+
+# where the logging files live
+log_dir = '/var/log/airtime/show-recorder'
+
+# Value needed to access the API
+api_key = 'AAA'
+
+# Path to the base of the API
+api_base = 'api'
+
+# URL to get the version number of the server API
+version_url = 'version/api_key/%%api_key%%'
+
+# URL to get the schedule of shows set to record
+show_schedule_url = 'recorded-shows/format/json/api_key/%%api_key%%'
+
+# URL to upload the recorded show's file to Airtime
+upload_file_url = 'upload-recorded/format/json/api_key/%%api_key%%'
+
+#number of retries to upload file if connection problem
+upload_retries = 3
+
+#time to wait between attempts to upload file if connection problem (in seconds)
+upload_wait = 60
diff --git a/install_minimal/upgrades/airtime-1.8.1/liquidsoap.cfg.181 b/install_minimal/upgrades/airtime-1.8.1/liquidsoap.cfg.181
new file mode 100644
index 000000000..360ee107f
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.8.1/liquidsoap.cfg.181
@@ -0,0 +1,38 @@
+###########################################
+# liquidsoap config file                  #
+###########################################
+
+
+###########################################
+# general settings                        #
+###########################################
+
+log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"
+log_level = 3
+
+###########################################
+# stream settings                         #
+###########################################
+icecast_host = "127.0.0.1"
+icecast_port = 8000
+icecast_pass = "hackme"
+
+###########################################
+# webstream mountpoint names              #
+###########################################
+mount_point_mp3 = "airtime.mp3"
+mount_point_vorbis = "airtime.ogg"
+
+###########################################
+# webstream metadata settings             #
+###########################################
+icecast_url = "http://airtime.sourcefabric.org"
+icecast_description = "Airtime Radio!"
+icecast_genre = "genre"
+
+###########################################
+#liquidsoap output settings              #
+###########################################
+output_sound_device = false
+output_icecast_vorbis = true
+output_icecast_mp3 = false
diff --git a/install_minimal/upgrades/airtime-1.8.1/pypo.cfg.181 b/install_minimal/upgrades/airtime-1.8.1/pypo.cfg.181
new file mode 100644
index 000000000..e2ab6fead
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.8.1/pypo.cfg.181
@@ -0,0 +1,139 @@
+############################################
+# pypo - configuration                     #
+############################################
+
+# Set the type of client you are using.
+# Currently supported types:
+# 1) "obp" = Open Broadcast Platform
+# 2) "airtime"
+#
+api_client = "airtime"
+
+############################################
+# Cache Directories                        #
+# *include* trailing slash !!              #
+############################################
+cache_dir = '/var/tmp/airtime/pypo/cache/'
+file_dir = '/var/tmp/airtime/pypo/files/' 
+tmp_dir = '/var/tmp/airtime/pypo/tmp/'
+
+############################################
+# Setup Directories                        #
+# Do *not* include trailing slash !!         #
+############################################
+cache_base_dir = '/var/tmp/airtime/pypo'
+bin_dir = '/usr/lib/airtime/pypo'
+log_base_dir = '/var/log/airtime'
+pypo_log_dir = '/var/log/airtime/pypo'
+liquidsoap_log_dir = '/var/log/airtime/pypo-liquidsoap'
+
+# Hostname
+base_url = 'localhost'
+base_port = 80
+
+############################################
+# Liquidsoap settings                      #
+############################################
+ls_host = '127.0.0.1'
+ls_port = '1234'
+
+############################################
+# RabbitMQ settings                        #
+############################################
+rabbitmq_host = 'localhost'
+rabbitmq_user = 'guest'
+rabbitmq_password = 'guest'
+
+############################################
+# pypo preferences                         #
+############################################
+prepare_ahead = 24 #in hours
+cache_for = 24 #how long to hold the cache, in hours
+
+# Poll interval in seconds.
+#
+# This will rarely need to be changed because any schedule changes are 
+# automatically sent to pypo immediately. 
+#
+# This is how often the poll script downloads new schedules and files from the
+# server in the event that no changes are made to the schedule.
+#
+poll_interval = 3600 # in seconds.
+
+
+# Push interval in seconds.
+#
+# This is how often the push script checks whether it has something new to
+# push to liquidsoap.
+#
+# It's hard to imagine a situation where this should be more than 1 second.
+#
+push_interval = 1 # in seconds
+
+# 'pre' or 'otf'. 'pre' cues while playlist preparation
+# while 'otf' (on the fly) cues while loading into ls  
+# (needs the post_processor patch)
+cue_style = 'pre'
+
+
+################################################################################
+# Uncomment *one of the sets* of values from the API clients below, and comment
+# out all the others.
+################################################################################
+
+#####################
+# Airtime Config #
+#####################
+# Value needed to access the API
+api_key = 'AAA'
+
+# Path to the base of the API
+api_base = 'api'
+
+# URL to get the version number of the server API
+version_url = 'version/api_key/%%api_key%%'
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+export_url = 'schedule/api_key/%%api_key%%'
+
+get_media_url = 'get-media/file/%%file%%/api_key/%%api_key%%'
+
+# Update whether a schedule group has begun playing.
+update_item_url = 'notify-schedule-group-play/api_key/%%api_key%%/schedule_id/%%schedule_id%%'
+
+# Update whether an audio clip is currently playing.
+update_start_playing_url = 'notify-media-item-start-play/api_key/%%api_key%%/media_id/%%media_id%%/schedule_id/%%schedule_id%%'
+
+# ???
+generate_range_url = 'generate_range_dp.php'
+
+
+##############
+# OBP config #
+##############
+# Value needed to access the API
+#api_key = 'AAA'
+
+#base_url = 'http://localhost/'
+
+# Path to the base of the API
+#api_base = ''
+
+# URL to get the version number of the server API
+#version_url = 'api/pypo/status/json'
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+
+# Update whether an item has been played.
+#update_item_url = 'api/pypo/update_shedueled_item/$$item_id%%?played=%%played%%' 
+
+# Update whether an item is currently playing.
+#update_start_playing_url = 'api/pypo/mod/medialibrary/?playlist_type=%%playlist_type%%&export_source=%%export_source%%&media_id=%%media_id%%&playlist_id=%%playlist_id%%&transmission_id=%%transmission_id%%'
+
+# ???
+#generate_range_url = 'api/pypo/generate_range_dp/'
+
diff --git a/install_minimal/upgrades/airtime-1.8.1/recorder.cfg.181 b/install_minimal/upgrades/airtime-1.8.1/recorder.cfg.181
new file mode 100644
index 000000000..22fcd227c
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.8.1/recorder.cfg.181
@@ -0,0 +1,35 @@
+api_client = "airtime"
+
+# Hostname
+base_url = 'localhost'
+base_port = 80
+
+# where the binary files live
+bin_dir = '/usr/lib/airtime/show-recorder'
+
+# base path to store recordered shows at
+base_recorded_files = '/var/tmp/airtime/show-recorder/'
+
+# where the logging files live
+log_dir = '/var/log/airtime/show-recorder'
+
+# Value needed to access the API
+api_key = 'AAA'
+
+# Path to the base of the API
+api_base = 'api'
+
+# URL to get the version number of the server API
+version_url = 'version/api_key/%%api_key%%'
+
+# URL to get the schedule of shows set to record
+show_schedule_url = 'recorded-shows/format/json/api_key/%%api_key%%'
+
+# URL to upload the recorded show's file to Airtime
+upload_file_url = 'upload-recorded/format/json/api_key/%%api_key%%'
+
+#number of retries to upload file if connection problem
+upload_retries = 3
+
+#time to wait between attempts to upload file if connection problem (in seconds)
+upload_wait = 60
diff --git a/install_minimal/upgrades/airtime-1.8.2/liquidsoap.cfg.182 b/install_minimal/upgrades/airtime-1.8.2/liquidsoap.cfg.182
new file mode 100644
index 000000000..98436d03a
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.8.2/liquidsoap.cfg.182
@@ -0,0 +1,46 @@
+###########################################
+# liquidsoap config file                  #
+###########################################
+
+
+###########################################
+# general settings                        #
+###########################################
+
+log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"
+log_level = 3
+
+###########################################
+# stream settings                         #
+###########################################
+icecast_host = "127.0.0.1"
+icecast_port = 8000
+icecast_pass = "hackme"
+
+###########################################
+# webstream mountpoint names              #
+###########################################
+mount_point_mp3 = "airtime.mp3"
+mount_point_vorbis = "airtime.ogg"
+
+###########################################
+# webstream metadata settings             #
+###########################################
+icecast_url = "http://airtime.sourcefabric.org"
+icecast_description = "Airtime Radio!"
+icecast_genre = "genre"
+
+###########################################
+#liquidsoap output settings              #
+###########################################
+output_sound_device = false
+output_icecast_vorbis = true
+output_icecast_mp3 = false
+
+
+#audio stream metadata for vorbis/ogg is disabled by default
+#due to a large number of client media players that disconnect
+#when the metadata changes to that of a new track. Some versions of
+#mplayer and VLC have this problem. Enable this option at your
+#own risk!
+output_icecast_vorbis_metadata = false
diff --git a/install_minimal/upgrades/airtime-1.8.2/pypo.cfg.182 b/install_minimal/upgrades/airtime-1.8.2/pypo.cfg.182
new file mode 100644
index 000000000..e2ab6fead
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.8.2/pypo.cfg.182
@@ -0,0 +1,139 @@
+############################################
+# pypo - configuration                     #
+############################################
+
+# Set the type of client you are using.
+# Currently supported types:
+# 1) "obp" = Open Broadcast Platform
+# 2) "airtime"
+#
+api_client = "airtime"
+
+############################################
+# Cache Directories                        #
+# *include* trailing slash !!              #
+############################################
+cache_dir = '/var/tmp/airtime/pypo/cache/'
+file_dir = '/var/tmp/airtime/pypo/files/' 
+tmp_dir = '/var/tmp/airtime/pypo/tmp/'
+
+############################################
+# Setup Directories                        #
+# Do *not* include trailing slash !!         #
+############################################
+cache_base_dir = '/var/tmp/airtime/pypo'
+bin_dir = '/usr/lib/airtime/pypo'
+log_base_dir = '/var/log/airtime'
+pypo_log_dir = '/var/log/airtime/pypo'
+liquidsoap_log_dir = '/var/log/airtime/pypo-liquidsoap'
+
+# Hostname
+base_url = 'localhost'
+base_port = 80
+
+############################################
+# Liquidsoap settings                      #
+############################################
+ls_host = '127.0.0.1'
+ls_port = '1234'
+
+############################################
+# RabbitMQ settings                        #
+############################################
+rabbitmq_host = 'localhost'
+rabbitmq_user = 'guest'
+rabbitmq_password = 'guest'
+
+############################################
+# pypo preferences                         #
+############################################
+prepare_ahead = 24 #in hours
+cache_for = 24 #how long to hold the cache, in hours
+
+# Poll interval in seconds.
+#
+# This will rarely need to be changed because any schedule changes are 
+# automatically sent to pypo immediately. 
+#
+# This is how often the poll script downloads new schedules and files from the
+# server in the event that no changes are made to the schedule.
+#
+poll_interval = 3600 # in seconds.
+
+
+# Push interval in seconds.
+#
+# This is how often the push script checks whether it has something new to
+# push to liquidsoap.
+#
+# It's hard to imagine a situation where this should be more than 1 second.
+#
+push_interval = 1 # in seconds
+
+# 'pre' or 'otf'. 'pre' cues while playlist preparation
+# while 'otf' (on the fly) cues while loading into ls  
+# (needs the post_processor patch)
+cue_style = 'pre'
+
+
+################################################################################
+# Uncomment *one of the sets* of values from the API clients below, and comment
+# out all the others.
+################################################################################
+
+#####################
+# Airtime Config #
+#####################
+# Value needed to access the API
+api_key = 'AAA'
+
+# Path to the base of the API
+api_base = 'api'
+
+# URL to get the version number of the server API
+version_url = 'version/api_key/%%api_key%%'
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+export_url = 'schedule/api_key/%%api_key%%'
+
+get_media_url = 'get-media/file/%%file%%/api_key/%%api_key%%'
+
+# Update whether a schedule group has begun playing.
+update_item_url = 'notify-schedule-group-play/api_key/%%api_key%%/schedule_id/%%schedule_id%%'
+
+# Update whether an audio clip is currently playing.
+update_start_playing_url = 'notify-media-item-start-play/api_key/%%api_key%%/media_id/%%media_id%%/schedule_id/%%schedule_id%%'
+
+# ???
+generate_range_url = 'generate_range_dp.php'
+
+
+##############
+# OBP config #
+##############
+# Value needed to access the API
+#api_key = 'AAA'
+
+#base_url = 'http://localhost/'
+
+# Path to the base of the API
+#api_base = ''
+
+# URL to get the version number of the server API
+#version_url = 'api/pypo/status/json'
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+
+# Update whether an item has been played.
+#update_item_url = 'api/pypo/update_shedueled_item/$$item_id%%?played=%%played%%' 
+
+# Update whether an item is currently playing.
+#update_start_playing_url = 'api/pypo/mod/medialibrary/?playlist_type=%%playlist_type%%&export_source=%%export_source%%&media_id=%%media_id%%&playlist_id=%%playlist_id%%&transmission_id=%%transmission_id%%'
+
+# ???
+#generate_range_url = 'api/pypo/generate_range_dp/'
+
diff --git a/install_minimal/upgrades/airtime-1.8.2/recorder.cfg.182 b/install_minimal/upgrades/airtime-1.8.2/recorder.cfg.182
new file mode 100644
index 000000000..22fcd227c
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.8.2/recorder.cfg.182
@@ -0,0 +1,35 @@
+api_client = "airtime"
+
+# Hostname
+base_url = 'localhost'
+base_port = 80
+
+# where the binary files live
+bin_dir = '/usr/lib/airtime/show-recorder'
+
+# base path to store recordered shows at
+base_recorded_files = '/var/tmp/airtime/show-recorder/'
+
+# where the logging files live
+log_dir = '/var/log/airtime/show-recorder'
+
+# Value needed to access the API
+api_key = 'AAA'
+
+# Path to the base of the API
+api_base = 'api'
+
+# URL to get the version number of the server API
+version_url = 'version/api_key/%%api_key%%'
+
+# URL to get the schedule of shows set to record
+show_schedule_url = 'recorded-shows/format/json/api_key/%%api_key%%'
+
+# URL to upload the recorded show's file to Airtime
+upload_file_url = 'upload-recorded/format/json/api_key/%%api_key%%'
+
+#number of retries to upload file if connection problem
+upload_retries = 3
+
+#time to wait between attempts to upload file if connection problem (in seconds)
+upload_wait = 60
diff --git a/install_minimal/upgrades/airtime-1.9.0/liquidsoap.cfg.190 b/install_minimal/upgrades/airtime-1.9.0/liquidsoap.cfg.190
new file mode 100644
index 000000000..ef4b26b62
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.9.0/liquidsoap.cfg.190
@@ -0,0 +1,55 @@
+###########################################
+# Liquidsoap config file                  #
+###########################################
+
+###########################################
+# Output settings                         #
+###########################################
+output_sound_device = false
+output_icecast_vorbis = true
+output_icecast_mp3 = false
+output_shoutcast = false
+
+#output_bitrate = 128
+#output_samplerate = 44100
+#output_stereo = true
+
+###########################################
+# Logging settings                        #
+###########################################
+log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"
+#log_level = 3
+
+###########################################
+# Icecast Stream settings                 #
+###########################################
+icecast_host = "127.0.0.1"
+icecast_port = 8000
+icecast_pass = "hackme"
+
+# Icecast mountpoint names
+mount_point_mp3 = "airtime.mp3"
+mount_point_vorbis = "airtime.ogg"
+
+# Webstream metadata settings
+icecast_url = "http://airtime.sourcefabric.org"
+icecast_description = "Airtime Radio!"
+icecast_genre = "genre"
+
+# Audio stream metadata for vorbis/ogg is disabled by default
+# due to a number of client media players that disconnect
+# when the metadata changes to a new track. Some versions of
+# mplayer and VLC have this problem. Enable this option at your
+# own risk!
+output_icecast_vorbis_metadata = false
+
+###########################################
+# Shoutcast Stream settings               #
+###########################################
+shoutcast_host = "127.0.0.1"
+shoutcast_port = 9000
+shoutcast_pass = "testing"
+
+# Webstream metadata settings
+shoutcast_url = "http://airtime.sourcefabric.org"
+shoutcast_genre = "genre"
diff --git a/install_minimal/upgrades/airtime-1.9.0/media-monitor.cfg.190 b/install_minimal/upgrades/airtime-1.9.0/media-monitor.cfg.190
new file mode 100644
index 000000000..066c42b31
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.9.0/media-monitor.cfg.190
@@ -0,0 +1,21 @@
+api_client = "airtime"
+
+# where the binary files live
+bin_dir = '/usr/lib/airtime/media-monitor'
+
+# where the logging files live
+log_dir = '/var/log/airtime/media-monitor'
+
+
+############################################
+# RabbitMQ settings                        #
+############################################
+rabbitmq_host = 'localhost'
+rabbitmq_user = 'guest'
+rabbitmq_password = 'guest'
+
+############################################
+# Media-Monitor preferences                         #
+############################################
+check_filesystem_events = 5 #how long to queue up events performed on the files themselves.
+check_airtime_events = 30 #how long to queue metadata input from airtime.
diff --git a/install_minimal/upgrades/airtime-1.9.0/pypo.cfg.190 b/install_minimal/upgrades/airtime-1.9.0/pypo.cfg.190
new file mode 100644
index 000000000..352d234d0
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.9.0/pypo.cfg.190
@@ -0,0 +1,72 @@
+############################################
+# pypo - configuration                     #
+############################################
+
+# Set the type of client you are using.
+# Currently supported types:
+# 1) "obp" = Open Broadcast Platform
+# 2) "airtime"
+#
+api_client = "airtime"
+
+############################################
+# Cache Directories                        #
+# *include* trailing slash !!              #
+############################################
+cache_dir = '/var/tmp/airtime/pypo/cache/'
+file_dir = '/var/tmp/airtime/pypo/files/' 
+tmp_dir = '/var/tmp/airtime/pypo/tmp/'
+
+############################################
+# Setup Directories                        #
+# Do *not* include trailing slash !!         #
+############################################
+cache_base_dir = '/var/tmp/airtime/pypo'
+bin_dir = '/usr/lib/airtime/pypo'
+log_base_dir = '/var/log/airtime'
+pypo_log_dir = '/var/log/airtime/pypo'
+liquidsoap_log_dir = '/var/log/airtime/pypo-liquidsoap'
+
+############################################
+# Liquidsoap settings                      #
+############################################
+ls_host = '127.0.0.1'
+ls_port = '1234'
+
+############################################
+# RabbitMQ settings                        #
+############################################
+rabbitmq_host = 'localhost'
+rabbitmq_user = 'guest'
+rabbitmq_password = 'guest'
+
+############################################
+# pypo preferences                         #
+############################################
+prepare_ahead = 24 #in hours
+cache_for = 24 #how long to hold the cache, in hours
+
+# Poll interval in seconds.
+#
+# This will rarely need to be changed because any schedule changes are 
+# automatically sent to pypo immediately. 
+#
+# This is how often the poll script downloads new schedules and files from the
+# server in the event that no changes are made to the schedule.
+#
+poll_interval = 3600 # in seconds.
+
+
+# Push interval in seconds.
+#
+# This is how often the push script checks whether it has something new to
+# push to liquidsoap.
+#
+# It's hard to imagine a situation where this should be more than 1 second.
+#
+push_interval = 1 # in seconds
+
+# 'pre' or 'otf'. 'pre' cues while playlist preparation
+# while 'otf' (on the fly) cues while loading into ls  
+# (needs the post_processor patch)
+cue_style = 'pre'
diff --git a/install_minimal/upgrades/airtime-1.9.0/recorder.cfg.190 b/install_minimal/upgrades/airtime-1.9.0/recorder.cfg.190
new file mode 100644
index 000000000..762c01da3
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.9.0/recorder.cfg.190
@@ -0,0 +1,26 @@
+api_client = "airtime"
+
+# where the binary files live
+bin_dir = '/usr/lib/airtime/show-recorder'
+
+# base path to store recordered shows at
+base_recorded_files = '/var/tmp/airtime/show-recorder/'
+
+# where the logging files live
+log_dir = '/var/log/airtime/show-recorder'
+
+############################################
+# RabbitMQ settings                        #
+############################################
+rabbitmq_host = 'localhost'
+rabbitmq_user = 'guest'
+rabbitmq_password = 'guest'
+
+############################################
+# Recorded Audio settings                  #
+############################################
+record_bitrate = 256
+record_samplerate = 44100
+record_channels = 2
+record_sample_size = 16
+

From 5adf47af4f9003a625e92201734a0330c5bfe675 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Tue, 2 Aug 2011 18:44:28 +0200
Subject: [PATCH 07/26] CC-2621 : Support upgrades from 1.7.0

---
 .../airtime-1.8.0/airtime-upgrade.php         |  23 ++--
 .../airtime-1.8.1/airtime-upgrade.php         |  23 ++--
 .../airtime-1.8.2/airtime-upgrade.php         |  23 ++--
 .../airtime-1.9.0/airtime-monit.cfg.190       |  23 ++++
 .../upgrades/airtime-1.9.0/api_client.cfg.190 | 110 ++++++++++++++++++
 5 files changed, 166 insertions(+), 36 deletions(-)
 create mode 100644 install_minimal/upgrades/airtime-1.9.0/airtime-monit.cfg.190
 create mode 100644 install_minimal/upgrades/airtime-1.9.0/api_client.cfg.190

diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index 29170d325..7b5472d73 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -62,10 +62,8 @@ $configFiles = array(AirtimeIni::CONF_FILE_AIRTIME,
 * This function creates the /etc/airtime configuration folder
 * and copies the default config files to it.
 */
-function CreateIniFiles()
+function CreateIniFiles($suffix)
 {
-    global $AIRTIME_PYTHON_APPS;
-
     if (!file_exists("/etc/airtime/")){
         if (!mkdir("/etc/airtime/", 0755, true)){
             echo "Could not create /etc/airtime/ directory. Exiting.";
@@ -73,20 +71,20 @@ function CreateIniFiles()
         }
     }
 
-    if (!copy(__DIR__."/airtime.conf.180", CONF_FILE_AIRTIME)){
-        echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/airtime.conf.$suffix", CONF_FILE_AIRTIME)){
+        echo "Could not copy airtime.conf.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/pypo.cfg", CONF_FILE_PYPO)){
-        echo "Could not copy pypo.cfg to /etc/airtime/. Exiting.";
+    if (!copy__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
+        echo "Could not copy pypo.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/show-recorder/recorder.cfg", CONF_FILE_RECORDER)){
-        echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/recorder.cfg.$suffix", CONF_FILE_RECORDER)){
+        echo "Could not copy recorder.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/liquidsoap_scripts/liquidsoap.cfg", CONF_FILE_LIQUIDSOAP)){
-        echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/liquidsoap.cfg.$suffix", CONF_FILE_LIQUIDSOAP)){
+        echo "Could not copy liquidsoap.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
 }
@@ -201,7 +199,8 @@ foreach ($configFiles as $conf) {
     }
 }
 
-CreateIniFiles();
+$suffix = "180";
+CreateIniFiles($suffix);
 echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
index 2b4764db2..828fe5af2 100644
--- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
@@ -114,10 +114,8 @@ function LoadConfig($CC_CONFIG) {
  * This function creates the /etc/airtime configuration folder
  * and copies the default config files to it.
  */
-function CreateIniFiles()
+function CreateIniFiles($suffix)
 {
-    global $AIRTIME_PYTHON_APPS;
-
     if (!file_exists("/etc/airtime/")){
         if (!mkdir("/etc/airtime/", 0755, true)){
             echo "Could not create /etc/airtime/ directory. Exiting.";
@@ -125,20 +123,20 @@ function CreateIniFiles()
         }
     }
 
-    if (!copy(__DIR__."/airtime.conf.181", CONF_FILE_AIRTIME)){
-        echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/airtime.conf.$suffix", CONF_FILE_AIRTIME)){
+        echo "Could not copy airtime.conf.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/pypo.cfg", CONF_FILE_PYPO)){
-        echo "Could not copy pypo.cfg to /etc/airtime/. Exiting.";
+    if (!copy__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
+        echo "Could not copy pypo.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/show-recorder/recorder.cfg", CONF_FILE_RECORDER)){
-        echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/recorder.cfg.$suffix", CONF_FILE_RECORDER)){
+        echo "Could not copy recorder.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/liquidsoap_scripts/liquidsoap.cfg", CONF_FILE_LIQUIDSOAP)){
-        echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/liquidsoap.cfg.$suffix", CONF_FILE_LIQUIDSOAP)){
+        echo "Could not copy liquidsoap.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
 }
@@ -226,7 +224,8 @@ foreach ($configFiles as $conf) {
     }
 }
 
-CreateIniFiles();
+$suffix = "181";
+CreateIniFiles($suffix);
 echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index 0f88c22c3..8ce224bbe 100644
--- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -114,10 +114,8 @@ function LoadConfig($CC_CONFIG) {
  * This function creates the /etc/airtime configuration folder
  * and copies the default config files to it.
  */
-function CreateIniFiles()
+function CreateIniFiles($suffix)
 {
-    global $AIRTIME_PYTHON_APPS;
-
     if (!file_exists("/etc/airtime/")){
         if (!mkdir("/etc/airtime/", 0755, true)){
             echo "Could not create /etc/airtime/ directory. Exiting.";
@@ -125,20 +123,20 @@ function CreateIniFiles()
         }
     }
 
-    if (!copy(__DIR__."/airtime.conf.182", CONF_FILE_AIRTIME)){
-        echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/airtime.conf.$suffix", CONF_FILE_AIRTIME)){
+        echo "Could not copy airtime.conf.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/pypo.cfg", CONF_FILE_PYPO)){
-        echo "Could not copy pypo.cfg to /etc/airtime/. Exiting.";
+    if (!copy__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
+        echo "Could not copy pypo.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/show-recorder/recorder.cfg", CONF_FILE_RECORDER)){
-        echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/recorder.cfg.$suffix", CONF_FILE_RECORDER)){
+        echo "Could not copy recorder.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/liquidsoap_scripts/liquidsoap.cfg", CONF_FILE_LIQUIDSOAP)){
-        echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/liquidsoap.cfg.$suffix", CONF_FILE_LIQUIDSOAP)){
+        echo "Could not copy liquidsoap.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
 }
@@ -225,7 +223,8 @@ foreach ($configFiles as $conf) {
     }
 }
 
-CreateIniFiles();
+$suffix = "182";
+CreateIniFiles($suffix);
 echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
diff --git a/install_minimal/upgrades/airtime-1.9.0/airtime-monit.cfg.190 b/install_minimal/upgrades/airtime-1.9.0/airtime-monit.cfg.190
new file mode 100644
index 000000000..22f05e2ca
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.9.0/airtime-monit.cfg.190
@@ -0,0 +1,23 @@
+ set daemon 10 # Poll at 10 second intervals
+ set logfile syslog facility log_daemon
+
+ set httpd port 2812 and use address 127.0.0.1
+    allow localhost
+    allow admin:monit
+
+ check process airtime-playout
+    with pidfile "/var/run/airtime-playout.pid"
+    start program = "/etc/init.d/airtime-playout start" with timeout 10 seconds
+    stop program = "/etc/init.d/airtime-playout stop"
+ check process airtime-liquidsoap
+    with pidfile "/var/run/airtime-liquidsoap.pid"
+    start program = "/etc/init.d/airtime-playout start" with timeout 10 seconds
+    stop program = "/etc/init.d/airtime-playout stop"
+# check process airtime-media-monitor
+#    with pidfile "/var/run/airtime-media-monitor.pid"
+#    start program = "/etc/init.d/airtime-media-monitor start" with timeout 10 seconds
+#    stop program = "/etc/init.d/airtime-media-monitor stop"
+ check process airtime-show-recorder
+    with pidfile "/var/run/airtime-show-recorder.pid"
+    start program = "/etc/init.d/airtime-show-recorder start" with timeout 10 seconds
+    stop program = "/etc/init.d/airtime-show-recorder stop"
diff --git a/install_minimal/upgrades/airtime-1.9.0/api_client.cfg.190 b/install_minimal/upgrades/airtime-1.9.0/api_client.cfg.190
new file mode 100644
index 000000000..7c94e34c2
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.9.0/api_client.cfg.190
@@ -0,0 +1,110 @@
+bin_dir = "/usr/lib/airtime/api_clients"
+
+#############################
+## Common
+#############################
+
+# Value needed to access the API
+api_key = 'AAA'
+
+# Path to the base of the API
+api_base = 'api'
+
+# URL to get the version number of the server API
+version_url = 'version/api_key/%%api_key%%'
+
+# Hostname
+base_url = 'localhost'
+base_port = 80
+
+#############################
+## Config for Media Monitor
+#############################
+
+# URL to setup the media monitor
+media_setup_url = 'media-monitor-setup/format/json/api_key/%%api_key%%'
+
+# Tell Airtime the file id associated with a show instance.
+upload_recorded = 'upload-recorded/format/json/api_key/%%api_key%%/fileid/%%fileid%%/showinstanceid/%%showinstanceid%%'
+
+# URL to tell Airtime to update file's meta data
+update_media_url = 'reload-metadata/format/json/api_key/%%api_key%%/mode/%%mode%%'
+
+# URL to tell Airtime we want a listing of all files it knows about
+list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%'
+
+# URL to tell Airtime we want a listing of all dirs its watching (including the stor dir)
+list_all_watched_dirs = 'list-all-watched-dirs/format/json/api_key/%%api_key%%'
+
+# URL to tell Airtime we want to add watched directory
+add_watched_dir = 'add-watched-dir/format/json/api_key/%%api_key%%/path/%%path%%'
+
+# URL to tell Airtime we want to add watched directory
+remove_watched_dir = 'remove-watched-dir/format/json/api_key/%%api_key%%/path/%%path%%'
+
+# URL to tell Airtime we want to add watched directory
+set_storage_dir = 'set-storage-dir/format/json/api_key/%%api_key%%/path/%%path%%'
+
+
+#############################
+## Config for Recorder
+#############################
+
+# URL to get the schedule of shows set to record
+show_schedule_url = 'recorded-shows/format/json/api_key/%%api_key%%'
+
+# URL to upload the recorded show's file to Airtime
+upload_file_url = 'upload-file/format/json/api_key/%%api_key%%'
+
+#number of retries to upload file if connection problem
+upload_retries = 3
+
+#time to wait between attempts to upload file if connection problem (in seconds)
+upload_wait = 60
+
+################################################################################
+# Uncomment *one of the sets* of values from the API clients below, and comment
+# out all the others.
+################################################################################
+
+#############################
+## Config for Pypo
+#############################
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+export_url = 'schedule/api_key/%%api_key%%'
+
+get_media_url = 'get-media/file/%%file%%/api_key/%%api_key%%'
+
+# Update whether a schedule group has begun playing.
+update_item_url = 'notify-schedule-group-play/api_key/%%api_key%%/schedule_id/%%schedule_id%%'
+
+# Update whether an audio clip is currently playing.
+update_start_playing_url = 'notify-media-item-start-play/api_key/%%api_key%%/media_id/%%media_id%%/schedule_id/%%schedule_id%%'
+
+# ???
+generate_range_url = 'generate_range_dp.php'
+
+
+##############
+# OBP config #
+##############
+
+# URL to get the version number of the server API
+#version_url = 'api/pypo/status/json'
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+
+# Update whether an item has been played.
+#update_item_url = 'api/pypo/update_shedueled_item/$$item_id%%?played=%%played%%' 
+
+# Update whether an item is currently playing.
+#update_start_playing_url = 'api/pypo/mod/medialibrary/?playlist_type=%%playlist_type%%&export_source=%%export_source%%&media_id=%%media_id%%&playlist_id=%%playlist_id%%&transmission_id=%%transmission_id%%'
+
+# ???
+#generate_range_url = 'api/pypo/generate_range_dp/'
+

From d7a1a93f04d8375036907274a1edfc6893b099fa Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 11:15:01 +0200
Subject: [PATCH 08/26] CC-2621 : Support upgrades from 1.7.0

---
 .../airtime-1.8.0/airtime-upgrade.php         |  4 ++--
 .../airtime-1.8.1/airtime-upgrade.php         |  4 ++--
 .../airtime-1.8.2/airtime-upgrade.php         |  4 ++--
 .../airtime-1.9.0/airtime-upgrade.php         | 23 +++++++++----------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index 7b5472d73..a0a38742d 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -199,8 +199,8 @@ foreach ($configFiles as $conf) {
     }
 }
 
-$suffix = "180";
-CreateIniFiles($suffix);
+$default_suffix = "180";
+CreateIniFiles($default_suffix);
 echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
index 828fe5af2..ea00b43de 100644
--- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
@@ -224,8 +224,8 @@ foreach ($configFiles as $conf) {
     }
 }
 
-$suffix = "181";
-CreateIniFiles($suffix);
+$default_suffix = "181";
+CreateIniFiles($default_suffix);
 echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index 8ce224bbe..3257e92c8 100644
--- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -223,8 +223,8 @@ foreach ($configFiles as $conf) {
     }
 }
 
-$suffix = "182";
-CreateIniFiles($suffix);
+$default_suffix = "182";
+CreateIniFiles($default_suffix);
 echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
diff --git a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
index 65a57b162..ce1a49ab9 100644
--- a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
@@ -401,7 +401,7 @@ class AirtimeIni{
     }
 
     public static function CreateMonitFile(){
-        if (!copy(__DIR__."/../../../python_apps/monit/airtime-monit.cfg", AirtimeIni::CONF_FILE_MONIT)){
+        if (!copy(__DIR__."/airtime-monit.cfg.190", AirtimeIni::CONF_FILE_MONIT)){
             echo "Could not copy airtime-monit.cfg to /etc/monit/conf.d/. Exiting.";
             exit(1);
         }
@@ -473,7 +473,9 @@ class AirtimeIni{
                 copy($conf, $conf.$suffix.".bak");
             }
         }
-        AirtimeIni::CreateIniFiles();
+
+        $default_suffix = "190";
+        AirtimeIni::CreateIniFiles($default_suffix);
         AirtimeIni::MergeConfigFiles($configFiles, $suffix);
     }
 
@@ -481,7 +483,7 @@ class AirtimeIni{
      * This function creates the /etc/airtime configuration folder
      * and copies the default config files to it.
      */
-    public static function CreateIniFiles()
+    public static function CreateIniFiles($suffix)
     {
         if (!file_exists("/etc/airtime/")){
             if (!mkdir("/etc/airtime/", 0755, true)){
@@ -490,22 +492,19 @@ class AirtimeIni{
             }
         }
 
-        $AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc');
-        $AIRTIME_PYTHON_APPS = realpath(__DIR__.'/../../../python_apps');
-
-        if (!copy($AIRTIME_SRC."/build/airtime.conf", AirtimeIni::CONF_FILE_AIRTIME)){
+        if (!copy(__DIR__."/airtime.conf.$suffix", AirtimeIni::CONF_FILE_AIRTIME)){
             echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
             exit(1);
         }
-        if (!copy($AIRTIME_PYTHON_APPS."/pypo/pypo.cfg", AirtimeIni::CONF_FILE_PYPO)){
+        if (!copy(__DIR__."/pypo.cfg.$suffix", AirtimeIni::CONF_FILE_PYPO)){
             echo "Could not copy pypo.cfg to /etc/airtime/. Exiting.";
             exit(1);
         }
-        if (!copy($AIRTIME_PYTHON_APPS."/show-recorder/recorder.cfg", AirtimeIni::CONF_FILE_RECORDER)){
+        if (!copy(__DIR__."/recorder.cfg.$suffix", AirtimeIni::CONF_FILE_RECORDER)){
             echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
             exit(1);
         }
-        if (!copy($AIRTIME_PYTHON_APPS."/pypo/liquidsoap_scripts/liquidsoap.cfg", AirtimeIni::CONF_FILE_LIQUIDSOAP)){
+        if (!copy(__DIR__."/liquidsoap.cfg.$suffix", AirtimeIni::CONF_FILE_LIQUIDSOAP)){
             echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
             exit(1);
         }
@@ -659,10 +658,10 @@ class Airtime190Upgrade{
         touch("/var/log/airtime/media-monitor/media-monitor.log");
 
         /* create media monitor config: */
-        if (!copy(__DIR__."/../../../python_apps/media-monitor/media-monitor.cfg", AirtimeIni::CONF_FILE_MEDIAMONITOR)){
+        if (!copy(__DIR__."/media-monitor.cfg.190", AirtimeIni::CONF_FILE_MEDIAMONITOR)){
             echo "Could not copy media-monitor.cfg to /etc/airtime/. Exiting.";
         }
-        if (!copy(__DIR__."/../../../python_apps/api_clients/api_client.cfg", AirtimeIni::CONF_FILE_API_CLIENT)){
+        if (!copy(__DIR__."/api_client.cfg.190", AirtimeIni::CONF_FILE_API_CLIENT)){
             echo "Could not copy api_client.cfg to /etc/airtime/. Exiting.";
         }
 

From 2c947c643f75f2ecb2d115ac10bce8f51af55a00 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 11:29:04 +0200
Subject: [PATCH 09/26] CC-2621 : Support upgrades from 1.7.0

---
 install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php | 2 +-
 install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php | 2 +-
 install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index a0a38742d..e45f0591a 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -75,7 +75,7 @@ function CreateIniFiles($suffix)
         echo "Could not copy airtime.conf.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
+    if (!copy(__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
         echo "Could not copy pypo.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
index ea00b43de..a3245522b 100644
--- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
@@ -127,7 +127,7 @@ function CreateIniFiles($suffix)
         echo "Could not copy airtime.conf.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
+    if (!copy(__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
         echo "Could not copy pypo.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index 3257e92c8..c19234d65 100644
--- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -127,7 +127,7 @@ function CreateIniFiles($suffix)
         echo "Could not copy airtime.conf.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
+    if (!copy(__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
         echo "Could not copy pypo.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }

From 89a182bdd16c2b8841294abebc57e0db2e745f3e Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 12:40:19 +0200
Subject: [PATCH 10/26] CC-2621 : Support upgrades from 1.7.0

---
 .../airtime-1.8.0/airtime-upgrade.php         | 54 ++++++++++++++++---
 .../airtime-1.8.1/airtime-upgrade.php         | 10 +---
 .../airtime-1.8.2/airtime-upgrade.php         |  9 +---
 3 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index e45f0591a..b98086956 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -7,20 +7,58 @@
  */
 
 set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
-require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php';
+//require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php';
 require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
 require_once(dirname(__FILE__).'/../../include/AirtimeIni.php');
 
-//global $AIRTIME_SRC;
-//global $AIRTIME_UTILS;
-global $AIRTIME_PYTHON_APPS;
-
 global $CC_CONFIG;
 
-//$AIRTIME_SRC = __DIR__.'/../../../airtime_mvc';
-//$AIRTIME_UTILS = __DIR__.'/../../../utils';
-$AIRTIME_PYTHON_APPS = __DIR__.'/../../../python_apps';
+function load_airtime_config(){
+	$ini_array = parse_ini_file('/etc/airtime/airtime.conf', true);
+    return $ini_array;
+}
 
+$values = load_airtime_config();
+
+$CC_CONFIG = array(
+
+    // Name of the web server user
+    'webServerUser' => $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__."/../..",
+    'pearPath'      =>  dirname(__FILE__).'/../../library/pear',
+    'zendPath'      =>  dirname(__FILE__).'/../../library/Zend',
+    'phingPath'      =>  dirname(__FILE__).'/../../library/phing',
+
+);
 
 AirtimeInstall::DbConnect(true);
 
diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
index a3245522b..aa82ca0b2 100644
--- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
@@ -18,16 +18,8 @@ const CONF_DIR_STORAGE = "/srv/airtime";
 const CONF_DIR_WWW = "/var/www/airtime";
 const CONF_DIR_LOG = "/var/log/airtime";
 
-global $AIRTIME_SRC;
-global $AIRTIME_UTILS;
-global $AIRTIME_PYTHON_APPS;
-
 global $CC_CONFIG;
 
-$AIRTIME_SRC = __DIR__.'/../../../airtime_mvc';
-$AIRTIME_UTILS = __DIR__.'/../../../utils';
-$AIRTIME_PYTHON_APPS = __DIR__.'/../../../python_apps';
-
 $configFiles = array(CONF_FILE_AIRTIME,
                      CONF_FILE_PYPO,
                      CONF_FILE_RECORDER,
@@ -48,7 +40,7 @@ $CC_CONFIG = array(
     'phingPath'      =>  dirname(__FILE__).'/../../library/phing'
 );
 
-//$CC_CONFIG = Config::loadConfig($CC_CONFIG);
+$CC_CONFIG = LoadConfig($CC_CONFIG);
 
 // Add database table names
 $CC_CONFIG['playListTable'] = $CC_CONFIG['tblNamePrefix'].'playlist';
diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index c19234d65..3096e374f 100644
--- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -18,16 +18,9 @@ const CONF_DIR_STORAGE = "/srv/airtime";
 const CONF_DIR_WWW = "/var/www/airtime";
 const CONF_DIR_LOG = "/var/log/airtime";
 
-global $AIRTIME_SRC;
-global $AIRTIME_UTILS;
-global $AIRTIME_PYTHON_APPS;
 
 global $CC_CONFIG;
 
-$AIRTIME_SRC = __DIR__.'/../../../airtime_mvc';
-$AIRTIME_UTILS = __DIR__.'/../../../utils';
-$AIRTIME_PYTHON_APPS = __DIR__.'/../../../python_apps';
-
 $configFiles = array(CONF_FILE_AIRTIME,
                      CONF_FILE_PYPO,
                      CONF_FILE_RECORDER,
@@ -48,7 +41,7 @@ $CC_CONFIG = array(
     'phingPath'      =>  dirname(__FILE__).'/../../library/phing'
 );
 
-//$CC_CONFIG = Config::loadConfig($CC_CONFIG);
+$CC_CONFIG = LoadConfig($CC_CONFIG);
 
 // Add database table names
 $CC_CONFIG['playListTable'] = $CC_CONFIG['tblNamePrefix'].'playlist';

From 5e5dc363d15da07727b82a3a8f13e512ab9c72aa Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 12:54:08 +0200
Subject: [PATCH 11/26] CC-2621 : Support upgrades from 1.7.0

---
 .../upgrades/airtime-1.9.0/airtime.conf.190   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 install_minimal/upgrades/airtime-1.9.0/airtime.conf.190

diff --git a/install_minimal/upgrades/airtime-1.9.0/airtime.conf.190 b/install_minimal/upgrades/airtime-1.9.0/airtime.conf.190
new file mode 100644
index 000000000..b11e672ce
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.9.0/airtime.conf.190
@@ -0,0 +1,23 @@
+[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_url = localhost
+base_port = 80
+
+[soundcloud]
+connection_retries = 3
+time_between_retries = 60

From 6e6cb286d5fd651b69812e6d6d72d7bb3771bdc9 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 13:01:47 +0200
Subject: [PATCH 12/26] CC-2621 : Support upgrades from 1.7.0

---
 install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index 3096e374f..888fb04d4 100644
--- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -85,8 +85,9 @@ function LoadConfig($CC_CONFIG) {
     // main directory for storing binary media files
     $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
 
-    $CC_CONFIG['baseUrl'] = $values['general']['base_url'];
-    $CC_CONFIG['basePort'] = $values['general']['base_port'];
+    //these next two entries are new for this release, will be undefined on first load.
+    $CC_CONFIG['baseUrl'] = isset($values['general']['base_url'])?$values['general']['base_url']:null;
+    $CC_CONFIG['basePort'] = isset($values['general']['base_port'])?$values['general']['base_port']:null;
 
     // Database config
     $CC_CONFIG['dsn']['username'] = $values['database']['dbuser'];

From b5431bb24f1c895492317c082f681d9190281bb0 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 15:48:37 +0200
Subject: [PATCH 13/26] CC-2621 : Support upgrades from 1.7.0

---
 install_minimal/include/AirtimeInstall.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 904cbe8f1..e28263b38 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -66,20 +66,17 @@ class AirtimeInstall
             $version = $CC_DBC->GetOne($sql);
 
             if (PEAR::isError($version)) {
-                return null;
+                $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
+                $result = $CC_DBC->GetOne($sql);
+                if (!PEAR::isError($result)) {
+                    $version = "1.7.0";
+                    //echo "Airtime Version: ".$version." ".PHP_EOL;
+                }
+                else {
+                    $version = false;
+                }
             }
 
-            $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
-            $result = $CC_DBC->GetOne($sql);
-            if (!PEAR::isError($result)) {
-                $version = "1.7.0";
-                //echo "Airtime Version: ".$version." ".PHP_EOL;
-            }
-
-            // no version string detected
-            if($version == ''){
-                $version = false;
-            }
             return $version;
         }
     }

From 8e364cf24decfda2203b179469833d1affdab378 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 16:00:04 +0200
Subject: [PATCH 14/26] CC-2621 : Support upgrades from 1.7.0

---
 .../upgrades/airtime-1.8.0/airtime-upgrade.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index b98086956..94a6673e8 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -9,7 +9,7 @@
 set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
 //require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php';
 require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
-require_once(dirname(__FILE__).'/../../include/AirtimeIni.php');
+//require_once(dirname(__FILE__).'/../../include/AirtimeIni.php');
 
 global $CC_CONFIG;
 
@@ -90,10 +90,10 @@ 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(AirtimeIni::CONF_FILE_AIRTIME,
-                     AirtimeIni::CONF_FILE_PYPO,
-                     AirtimeIni::CONF_FILE_RECORDER,
-                     AirtimeIni::CONF_FILE_LIQUIDSOAP);
+$configFiles = array(CONF_FILE_AIRTIME,
+                     CONF_FILE_PYPO,
+                     CONF_FILE_RECORDER,
+                     CONF_FILE_LIQUIDSOAP);
 
 
 /**
@@ -180,6 +180,14 @@ function MergeConfigFiles($configFiles, $suffix)
                 $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/'
+            }
+
             $settings = array_keys($newSettings);
 
             foreach($settings as $section) {

From a0789174ba9e3f305d4c42ed8f429d71ec8904a7 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 16:12:19 +0200
Subject: [PATCH 15/26] CC-2621 : Support upgrades from 1.7.0

---
 install_minimal/include/AirtimeInstall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index e28263b38..149741a90 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -65,7 +65,7 @@ class AirtimeInstall
             $sql = "SELECT valstr FROM cc_pref WHERE keystr = 'system_version'";
             $version = $CC_DBC->GetOne($sql);
 
-            if (PEAR::isError($version)) {
+            if ($version == '') {
                 $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
                 $result = $CC_DBC->GetOne($sql);
                 if (!PEAR::isError($result)) {

From 85ae402a2011d74deb627772fdd581c509ed7704 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 16:21:29 +0200
Subject: [PATCH 16/26] CC-2621 : Support upgrades from 1.7.0

---
 install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index 94a6673e8..1451c9c86 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -183,9 +183,9 @@ function MergeConfigFiles($configFiles, $suffix)
             //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/'
+                $oldSettings['cache_dir'] = '/var/tmp/airtime/pypo/cache/';
+                $oldSettings['file_dir'] = '/var/tmp/airtime/pypo/files/';
+                $oldSettings['tmp_dir'] = '/var/tmp/airtime/pypo/tmp/';
             }
 
             $settings = array_keys($newSettings);

From ea0139e389e943c8a6e0d5d74e72a3160833658f Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 16:35:49 +0200
Subject: [PATCH 17/26] CC-2621 : Support upgrades from 1.7.0

---
 install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index 1451c9c86..dabbf0b22 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -7,9 +7,7 @@
  */
 
 set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
-//require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php';
 require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
-//require_once(dirname(__FILE__).'/../../include/AirtimeIni.php');
 
 global $CC_CONFIG;
 
@@ -187,6 +185,10 @@ function MergeConfigFiles($configFiles, $suffix)
                 $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);
 

From f01a95356d6d0f06885bd3d197a632580c488372 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@64studio.com>
Date: Wed, 3 Aug 2011 15:52:37 +0100
Subject: [PATCH 18/26] Added more license details to LICENSE_3RD_PARTY file

---
 LICENSE_3RD_PARTY | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/LICENSE_3RD_PARTY b/LICENSE_3RD_PARTY
index 3bf76fc72..1807bd4e9 100644
--- a/LICENSE_3RD_PARTY
+++ b/LICENSE_3RD_PARTY
@@ -36,11 +36,12 @@ Linked code:
  * Kombu
    - Web site: http://pypi.python.org/pypi/kombu/
    - License: New BSD
-   - Compatible with GPLv3? Yes. 
+   - Compatible with GPLv3? Yes 
 
  * pyinotify
    - Web site: https://github.com/seb-m/pyinotify
    - License: MIT
+   - Compatible with GPLv3? Yes
 
  * PHP-AMQPLIB
    - Web site: https://github.com/tnc/php-amqplib 
@@ -50,14 +51,17 @@ Linked code:
 ----------------
 Non-linked code:
 ----------------
- * Linux
+ * Linux 2.6
+   - Web site: http://www.kernel.org/
+   - License: GPLv2. See http://www.kernel.org/pub/linux/kernel/COPYING
 
  * Apache Web Server 2.2 
    - Web site: http://httpd.apache.org/
+   - License: Apache 2.0. See http://httpd.apache.org/docs/2.2/license.html
 
  * PostgreSQL 8.4 
    - Web site: http://www.postgresql.org/
-   - License: The PostgreSQL License.  See http://www.opensource.org/licenses/postgresql
+   - License: The PostgreSQL License. See http://www.postgresql.org/about/licence
 
  * PHP 5.3 
    - Web site: http://www.php.net/
@@ -69,9 +73,11 @@ Non-linked code:
 
  * Liquidsoap (pre-release of 1.0) 
    - Web site: http://savonet.sourceforge.net/
-   - License: GPLv2
+   - License: GPLv2 
 
  * mp3cut from the package poc-streamer
+   - Web site: https://bl0rg.net/software/poc/
+   - License: BSD 3-Clause
 
  * ecasound 2.7.2
    - Web site: http://www.eca.cx/ecasound/
@@ -122,3 +128,6 @@ Non-linked code:
        - Web site: http://code.google.com/p/jq-serverbrowse/
        - License: BSD 2-Clause 
 
+ * RabbitMQ
+   - Web site: http://www.rabbitmq.com/
+   - License: Mozilla Public License. See http://www.rabbitmq.com/mpl.html

From 63ce5a088eae3665c05085482593b1dd01c494ef Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@64studio.com>
Date: Wed, 3 Aug 2011 15:59:49 +0100
Subject: [PATCH 19/26] Removed duplicate stanza for RabbitMQ

---
 LICENSE_3RD_PARTY | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/LICENSE_3RD_PARTY b/LICENSE_3RD_PARTY
index 87e1080bd..bab22fdd7 100644
--- a/LICENSE_3RD_PARTY
+++ b/LICENSE_3RD_PARTY
@@ -130,8 +130,5 @@ Non-linked code:
 
      * Server Browse
        - Web site: http://code.google.com/p/jq-serverbrowse/
-       - License: BSD 2-Clause 
+       - License: BSD 2-Clause
 
- * RabbitMQ
-   - Web site: http://www.rabbitmq.com/
-   - License: Mozilla Public License. See http://www.rabbitmq.com/mpl.html

From 1f5e43bb7b7f863ec8a4c992060f5d265db95bc7 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 3 Aug 2011 11:25:48 -0400
Subject: [PATCH 20/26] CC-2634: Downloading a file with a non-ASCI name,
 doesn't show up those chars

- removed pathinfo() call and manually parsing the basefile name.
---
 airtime_mvc/application/controllers/ApiController.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index e81469fa9..d54f292ac 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -103,8 +103,14 @@ class ApiController extends Zend_Controller_Action
                     //We just want the basename which is the file name with the path
                     //information stripped away. We are using Content-Disposition to specify
                     //to the browser what name the file should be saved as.
-                    $path_parts = pathinfo($media->getPropelOrm()->getDbFilepath());
-                    header('Content-Disposition: attachment; filename="'.$path_parts['basename'].'"');
+                    //
+                    // By james.moon:
+                    // I'm removing pathinfo() since it strips away UTF-8 characters.
+                    // Using manualy parsing
+                    $full_path = $media->getPropelOrm()->getDbFilepath();
+                    $file_base_name = strrchr($full_path, '/');
+                    $file_base_name = substr($file_base_name, 1);
+                    header('Content-Disposition: attachment; filename="'.$file_base_name.'"');
                 }
                 header("Content-Length: " . filesize($filepath));
 

From 55746ed8222079dd9c0e25e5cc5a96360bab69f0 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 18:32:59 +0200
Subject: [PATCH 21/26] CC-2632 : Language metadata from version 1.8 doesn't
 exist in 1.9 metadata

---
 airtime_mvc/application/configs/constants.php |  1 +
 airtime_mvc/application/forms/EditAudioMD.php | 15 +++++++++++----
 airtime_mvc/application/models/StoredFile.php |  7 ++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php
index 71a62ef8a..270e78b1d 100644
--- a/airtime_mvc/application/configs/constants.php
+++ b/airtime_mvc/application/configs/constants.php
@@ -28,6 +28,7 @@ define('MDATA_KEY_YEAR', 'year');
 define('MDATA_KEY_BPM', 'bpm');
 define('MDATA_KEY_TRACKNUMBER', 'track_number');
 define('MDATA_KEY_CONDUCTOR', 'conductor');
+define('MDATA_KEY_LANGUAGE', 'language');
 
 define('UI_MDATA_VALUE_FORMAT_FILE', 'File');
 define('UI_MDATA_VALUE_FORMAT_STREAM', 'live stream');
diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index 14ff80484..5e9b5969b 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -101,34 +101,41 @@ class Application_Form_EditAudioMD extends Zend_Form
             'filters'    => array('StringTrim')
         ));
 
-        // Add mood field
+        // Add bmp field
         $this->addElement('text', 'bpm', array(
             'label'      => 'BPM:',
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
-        // Add mood field
+        // Add copyright field
         $this->addElement('text', 'copyright', array(
             'label'      => 'Copyright:',
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
-        // Add mood field
+        // Add isrc number field
         $this->addElement('text', 'isrc_number', array(
             'label'      => 'ISRC Number:',
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
-        // Add mood field
+        // Add website field
         $this->addElement('text', 'info_url', array(
             'label'      => 'Website:',
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
+        // Add language field
+        $this->addElement('text', 'language', array(
+            'label'      => 'Language:',
+            'class'      => 'input_text',
+            'filters'    => array('StringTrim')
+        ));
+
 		// Add the submit button
         $this->addElement('submit', 'submit', array(
             'ignore'   => true,
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 156439f19..922856feb 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -40,7 +40,8 @@ class StoredFile {
         "sample_rate" => "DbSampleRate",
         "mime" => "DbMime",
         "md5" => "DbMd5",
-        "ftype" => "DbFtype"
+        "ftype" => "DbFtype",
+        "language" => "DbLanguage"
     );
 
     public function __construct()
@@ -819,7 +820,7 @@ class StoredFile {
         $r = @copy($audio_file, $audio_stor);*/
 
     }
-    
+
     public static function copyFileToStor($p_targetDir, $fileName){
         $audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $fileName;
 
@@ -834,7 +835,7 @@ class StoredFile {
                 die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}');
             }
         }
-        
+
         $storDir = MusicDir::getStorDir();
         $stor = $storDir->getDirectory();
 

From 3cdc808d6c3381bacad86e43ae1340b9cc3e6904 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 3 Aug 2011 14:42:34 -0400
Subject: [PATCH 22/26] CC-2626: long numbers after the dot should be truncated

- fixed
---
 airtime_mvc/application/controllers/ScheduleController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index f9316b20e..953cfee52 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -285,6 +285,11 @@ class ScheduleController extends Zend_Controller_Action
 
 		$show = new ShowInstance($this->sched_sess->showInstanceId);
 		$playlists = $show->searchPlaylistsForShow($post);
+		foreach( $playlists['aaData'] as &$data){
+		    // calling two functions to format time to 1 decimal place
+            $sec = Playlist::playlistTimeToSeconds($data[4]);
+            $data[4] = Playlist::secondsToPlaylistTime($sec); 
+		}
 
 		//for datatables
 		die(json_encode($playlists));

From 0bee579642ef7e6a2e95eef49c689a43feff7308 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 3 Aug 2011 14:45:51 -0400
Subject: [PATCH 23/26] CC-2633: airtime-import of relative path crashes

- using copy() instead of copy2()
- copy2() causes some time issue with media monitor
---
 utils/airtime-import/airtime-import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/airtime-import/airtime-import.py b/utils/airtime-import/airtime-import.py
index e4a47e0bb..e690cfde9 100644
--- a/utils/airtime-import/airtime-import.py
+++ b/utils/airtime-import/airtime-import.py
@@ -56,7 +56,7 @@ def copy_or_move_files_to(paths, dest, flag):
                     destfile = dest+os.path.basename(path)
                     if(flag == 'copy'):
                         print "Copying %(src)s to %(dest)s..." % {'src':path, 'dest':destfile}
-                        shutil.copy2(path, destfile)
+                        shutil.copy(path, destfile)
                     elif(flag == 'move'):
                         print "Moving %(src)s to %(dest)s..." % {'src':path, 'dest':destfile}
                         shutil.move(path, destfile)

From 4c51f20c74be714589e8ab5be242ffd4e5434e2c Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 3 Aug 2011 15:28:40 -0400
Subject: [PATCH 24/26] CC-2633: airtime-import of relative path crashes

- fixed
- using copyfile() instead of copy()
---
 utils/airtime-import/airtime-import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/airtime-import/airtime-import.py b/utils/airtime-import/airtime-import.py
index e690cfde9..caa9d71f9 100644
--- a/utils/airtime-import/airtime-import.py
+++ b/utils/airtime-import/airtime-import.py
@@ -56,7 +56,7 @@ def copy_or_move_files_to(paths, dest, flag):
                     destfile = dest+os.path.basename(path)
                     if(flag == 'copy'):
                         print "Copying %(src)s to %(dest)s..." % {'src':path, 'dest':destfile}
-                        shutil.copy(path, destfile)
+                        shutil.copyfile(path, destfile)
                     elif(flag == 'move'):
                         print "Moving %(src)s to %(dest)s..." % {'src':path, 'dest':destfile}
                         shutil.move(path, destfile)

From 112f68c044cd6c0051fb81836c06dc03623385ac Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 3 Aug 2011 17:57:57 -0400
Subject: [PATCH 25/26] - version string change

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 1f3a63c2c..8e07f99cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=1.9.0-RC2
+PRODUCT_RELEASE=1.9.0-RC3

From 52c6b36bc4997ef3803c1c40adafdf8e7040975a Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 3 Aug 2011 18:13:30 -0400
Subject: [PATCH 26/26] CC-2639: Airtime Full installation does not install
 virtualenv

- fixed
---
 install_full/ubuntu/airtime-full-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install
index b27cb5fb6..9c6800ac1 100755
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@@ -28,7 +28,7 @@ sudo apt-get -y install tar gzip curl apache2 php5-pgsql libapache2-mod-php5 \
 php-pear php5-gd postgresql odbc-postgresql python2.6 lame libsoundtouch-ocaml \
 libvorbis-ocaml-dev libmp3lame-dev libtaglib-ocaml libao-ocaml libmad-ocaml \
 libesd0 icecast2 sudo libportaudio2 libsamplerate0 libcamomile-ocaml-dev \
-ecasound php5-curl mpg123 rabbitmq-server monit
+ecasound php5-curl mpg123 rabbitmq-server monit python-virtualenv
 
 if [ "$?" -ne "0" ]; then
    echo ""