Merge branch '2.5.x-installer' into saas-installer-albert

Conflicts:
	.gitignore
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/SystemstatusController.php
	airtime_mvc/application/controllers/UpgradeController.php
	airtime_mvc/application/upgrade/Upgrades.php
	airtime_mvc/application/views/scripts/systemstatus/index.phtml
	airtime_mvc/build/airtime.conf
	airtime_mvc/build/sql/defaultdata.sql
	airtime_mvc/public/index.php
	airtime_mvc/tests/application/helpers/AirtimeInstall.php
	install_minimal/airtime-install
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-copy-files.sh
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-initialize.sh
	install_minimal/include/airtime-install.php
	install_minimal/include/airtime-installed-check.php
	install_minimal/include/airtime-remove-files.sh
	install_minimal/include/airtime-upgrade.php
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/monit/monit-airtime-generic.cfg
	python_apps/pypo/airtime-playout
	python_apps/pypo/install/pypo-copy-files.py
	python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
	python_apps/pypo/liquidsoap/ls_script.liq
	python_apps/pypo/pypo/__main__.py
	python_apps/pypo/pypo/media/update/replaygain.py
	python_apps/pypo/pypo/media/update/replaygainupdater.py
	python_apps/pypo/pypo/media/update/silananalyzer.py
	python_apps/python-virtualenv/airtime_virtual_env.pybundle
	python_apps/python-virtualenv/requirements
	utils/airtime-check-system.php

airtime_mvc/public/setup/media-setup.php

@@ -0,0 +1,141 @@
+<?php
+
+define("CONFIG_PATH", dirname(dirname( __DIR__)) . "/application/configs/");
+define("DEFAULT_STOR_DIR", "/srv/airtime/stor/");
+
+require_once(dirname(dirname( __DIR__)) . "/../vendor/propel/propel1/runtime/lib/Propel.php");
+require_once(CONFIG_PATH . 'conf.php');
+
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/map/CcMusicDirsTableMap.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/om/BaseCcMusicDirsQuery.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/CcMusicDirsQuery.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/om/BaseCcMusicDirs.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/CcMusicDirs.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/om/BaseCcMusicDirsPeer.php");
+require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/CcMusicDirsPeer.php");
+
+/**
+ * Author: sourcefabric
+ * Date: 08/12/14
+ *
+ * Class MediaSetup
+ *
+ * Wrapper class for validating and setting up media folder during the installation process
+ */
+class MediaSetup extends Setup {
+
+    const MEDIA_FOLDER = "mediaFolder";
+    const AIRTIME_CONF_PATH = "/etc/airtime/airtime.conf";
+    
+    static $path;
+    static $message = null;
+    static $errors = array();
+
+    function __construct($settings) {
+        self::$path = $settings[self::MEDIA_FOLDER];
+    }
+
+    /**
+     * @return array associative array containing a display message and fields with errors
+     */
+    function runSetup() {
+        // If the path passed in is empty, set it to the default
+        if (strlen(self::$path) == 0) {
+            self::$path = DEFAULT_STOR_DIR;
+            if (!file_exists(DEFAULT_STOR_DIR)) {
+                mkdir(DEFAULT_STOR_DIR, 0755, true);
+            }
+        }
+
+        // Append a trailing / if they didn't
+        if (!(substr(self::$path, -1) == "/")) {
+            self::$path .= "/";
+        }
+
+        if (file_exists(self::$path)) {
+            $this->setupMusicDirectory();
+        } else {
+            self::$message = "Invalid path!";
+            self::$errors[] = self::MEDIA_FOLDER;
+        }
+        
+        // Finalize and move airtime.conf.temp
+        if (file_exists("/etc/airtime/")) {
+            if (!$this->moveAirtimeConfig()) {
+                $message = "Error moving airtime.conf or deleting /tmp/airtime.conf.temp!";
+                $errors[] = "ERR";
+            }
+            
+            /* 
+             * If we're upgrading from an old Airtime instance (pre-2.5.2) we rename their old 
+             * airtime.conf to airtime.conf.tmp during the setup process. Now that we're done,
+             * we can rename it to airtime.conf.bak to avoid confusion.
+             */
+            if (file_exists(self::AIRTIME_CONF_PATH . ".tmp")) {
+                rename(self::AIRTIME_CONF_PATH . ".tmp", self::AIRTIME_CONF_PATH . ".bak");
+            }
+        } else {
+            $message = "Failed to move airtime.conf; /etc/airtime doesn't exist!";
+            $errors[] = "ERR";
+        }
+        
+        return array(
+            "message" => self::$message,
+            "errors" => self::$errors
+        );
+    }
+    
+    /**
+     * Moves /tmp/airtime.conf.temp to /etc/airtime.conf and then removes it to complete setup
+     * @return boolean false if either of the copy or removal operations fail
+     */
+    function moveAirtimeConfig() {
+        return copy(AIRTIME_CONF_TEMP_PATH, self::AIRTIME_CONF_PATH)
+            && unlink(AIRTIME_CONF_TEMP_PATH);
+    }
+
+    /**
+     * Add the given directory to cc_music_dirs
+     * TODO Should we check for an existing entry in cc_music_dirs?
+     */
+    function setupMusicDirectory() {
+        try {
+            $_SERVER['AIRTIME_CONF'] = AIRTIME_CONF_TEMP_PATH;
+            Propel::init(CONFIG_PATH . "airtime-conf-production.php");
+            $con = Propel::getConnection();
+        } catch(Exception $e) {
+            self::$message = "Failed to insert media folder; database isn't configured properly!";
+            self::$errors[] = self::MEDIA_FOLDER;
+            return;
+        }
+
+        $this->runMusicDirsQuery($con);
+    }
+
+    function runMusicDirsQuery($con) {
+        try {
+            if ($this->checkMusicDirectoryExists($con)) {
+                $dir = CcMusicDirsQuery::create()->findPk(1, $con);
+            } else {
+                $dir = new CcMusicDirs();
+            }
+
+            $dir->setDirectory(self::$path)
+                ->setType("stor")
+                ->save();
+            self::$message = "Successfully set up media folder!";
+            Propel::close();
+            unset($_SERVER['AIRTIME_CONF']);
+        } catch (Exception $e) {
+            self::$message = "Failed to insert " . self::$path . " into cc_music_dirs";
+            self::$errors[] = self::MEDIA_FOLDER;
+        }
+
+    }
+
+    function checkMusicDirectoryExists($con) {
+        $entry = CcMusicDirsQuery::create()->findPk(1, $con);
+        return isset($entry) && $entry;
+    }
+
+}