diff --git a/LICENSE_3RD_PARTY b/LICENSE_3RD_PARTY
index 1807bd4e9..87e1080bd 100644
--- a/LICENSE_3RD_PARTY
+++ b/LICENSE_3RD_PARTY
@@ -75,6 +75,10 @@ Non-linked code:
    - Web site: http://savonet.sourceforge.net/
    - License: GPLv2 
 
+ * RabbitMQ (works with version 1.7.2 and above)
+   - Web site: http://www.rabbitmq.com/
+   - License: Mozilla Public License (http://www.rabbitmq.com/mpl.html)
+
  * mp3cut from the package poc-streamer
    - Web site: https://bl0rg.net/software/poc/
    - License: BSD 3-Clause
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 8396b370b..19fd6da1f 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -315,13 +315,15 @@ class Application_Model_Preference
     	$outputArray['STATION_DESCRIPTION'] = Application_Model_Preference::GetStationDescription();
 
     	// get web server info
-    	$url = $systemInfoArray["AIRTIME_VERSION_URL"];
-    	$index = strpos($url,'/api/');
-    	$url = substr($url, 0, $index);
-
-    	$headerInfo = get_headers(trim($url),1);
-    	$outputArray['WEB_SERVER'] = $headerInfo['Server'][0];
-
+    	if(isset($systemInfoArray["AIRTIME_VERSION_URL"])){
+    	   $url = $systemInfoArray["AIRTIME_VERSION_URL"];
+           $index = strpos($url,'/api/');
+           $url = substr($url, 0, $index);
+    
+           $headerInfo = get_headers(trim($url),1);
+           $outputArray['WEB_SERVER'] = $headerInfo['Server'][0];
+    	}
+    	
     	$outputArray['NUM_OF_USERS'] = User::getUserCount();
     	$outputArray['NUM_OF_SONGS'] = StoredFile::getFileCount();
     	$outputArray['NUM_OF_PLAYLISTS'] = Playlist::getPlaylistCount();
diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js
index 41818c748..76bdf532b 100644
--- a/airtime_mvc/public/js/airtime/library/plupload.js
+++ b/airtime_mvc/public/js/airtime/library/plupload.js
@@ -24,8 +24,18 @@ $(document).ready(function() {
 				.append('<td>' + j.error.message + '</td>');
 				
 			$("#plupload_error").find("table").append(row);
+		}else{
+		    $.get('/Plupload/copyfile/format/json/name/'+file.name, function(json){
+		        var jr = jQuery.parseJSON(json);
+		        if(jr.error !== undefined) {
+		            var row = $("<tr/>")
+		                .append('<td>' + file.name +'</td>')
+		                .append('<td>' + jr.error.message + '</td>');
+		                
+		            $("#plupload_error").find("table").append(row);
+		        }
+		    });
 		}
-		$.get('/Plupload/copyfile/format/json/name/'+file.name);
 	});
 	
 	var uploadProgress = false;
diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 60438e200..149741a90 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -65,13 +65,18 @@ class AirtimeInstall
             $sql = "SELECT valstr FROM cc_pref WHERE keystr = 'system_version'";
             $version = $CC_DBC->GetOne($sql);
 
-            if (PEAR::isError($version)) {
-                return null;
-            }
-            // no version string detected
-            if($version == ''){
-                $version = false;
+            if ($version == '') {
+                $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;
+                }
             }
+
             return $version;
         }
     }
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 897555da6..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,56 @@
  */
 
 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;
+
+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);
 
@@ -41,26 +88,18 @@ 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);
 
-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
 * 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.";
@@ -68,40 +107,149 @@ function CreateIniFiles()
         }
     }
 
-    if (!copy("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);
     }
 }
 
-echo "* Creating INI files".PHP_EOL;
-CreateIniFiles();
+function ReadPythonConfig($p_filename)
+{
+    $values = array();
 
-AirtimeInstall::InstallPhpCode();
-AirtimeInstall::InstallBinaries();
+    $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");
+            }
+
+            //override some values needed for 1.8.0.
+            if($conf === CONF_FILE_PYPO) {
+
+                $oldSettings['cache_dir'] = '/var/tmp/airtime/pypo/cache/';
+                $oldSettings['file_dir'] = '/var/tmp/airtime/pypo/files/';
+                $oldSettings['tmp_dir'] = '/var/tmp/airtime/pypo/tmp/';
+            }
+            else if($conf === CONF_FILE_RECORDER) {
+
+                $oldSettings['base_recorded_files'] = '/var/tmp/airtime/show-recorder/';
+            }
+
+            $settings = array_keys($newSettings);
+
+            foreach($settings as $section) {
+                if(isset($oldSettings[$section])) {
+                    if(is_array($oldSettings[$section])) {
+                        $sectionKeys = array_keys($newSettings[$section]);
+                        foreach($sectionKeys as $sectionKey) {
+                            if(isset($oldSettings[$section][$sectionKey])) {
+                                UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]);
+                            }
+                        }
+                    }
+                    else {
+                        UpdateIniValue($conf, $section, $oldSettings[$section]);
+                    }
+                }
+            }
+        }
+    }
+}
+
+function LoadConfig($CC_CONFIG) {
+    $values = parse_ini_file(CONF_FILE_AIRTIME, true);
+
+    // Name of the web server user
+    $CC_CONFIG['webServerUser'] = $values['general']['web_server_user'];
+    $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
+    $CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
+
+    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
+    // main directory for storing binary media files
+    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
+
+    // Database config
+    $CC_CONFIG['dsn']['username'] = $values['database']['dbuser'];
+    $CC_CONFIG['dsn']['password'] = $values['database']['dbpass'];
+    $CC_CONFIG['dsn']['hostspec'] = $values['database']['host'];
+    $CC_CONFIG['dsn']['phptype'] = 'pgsql';
+    $CC_CONFIG['dsn']['database'] = $values['database']['dbname'];
+
+    $CC_CONFIG['apiKey'] = array($values['general']['api_key']);
+
+    $CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries'];
+    $CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries'];
+
+    return $CC_CONFIG;
+}
+
+// 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");
+    }
+}
+
+$default_suffix = "180";
+CreateIniFiles($default_suffix);
 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();
-
-$ini = parse_ini_file(__DIR__."/../../include/airtime-install.ini");
-$stor_dir = $ini["storage_dir"];
-
-AirtimeInstall::ChangeDirOwnerToWebserver($stor_dir);
-AirtimeInstall::CreateSymlinksToUtils();
+$CC_CONFIG = LoadConfig($CC_CONFIG);
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/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
index c077e1c25..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';
@@ -88,6 +80,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'];
 
@@ -110,10 +106,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.";
@@ -121,20 +115,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);
     }
 }
@@ -222,7 +216,8 @@ foreach ($configFiles as $conf) {
     }
 }
 
-CreateIniFiles();
+$default_suffix = "181";
+CreateIniFiles($default_suffix);
 echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
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/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index 788db3e26..888fb04d4 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';
@@ -88,8 +81,13 @@ function LoadConfig($CC_CONFIG) {
     $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
     $CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
 
-    $CC_CONFIG['baseUrl'] = $values['general']['base_url'];
-    $CC_CONFIG['basePort'] = $values['general']['base_port'];
+    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
+    // main directory for storing binary media files
+    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
+
+    //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'];
@@ -110,10 +108,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.";
@@ -121,20 +117,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);
     }
 }
@@ -221,7 +217,8 @@ foreach ($configFiles as $conf) {
     }
 }
 
-CreateIniFiles();
+$default_suffix = "182";
+CreateIniFiles($default_suffix);
 echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
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/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/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.";
         }
 
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
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/'
+
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
+