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

python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py

@@ -0,0 +1,56 @@
+import logging
+import sys
+import time
+import traceback
+from api_clients.api_client import AirtimeApiClient
+
+def generate_liquidsoap_config(ss):
+    data = ss['msg']
+    fh = open('/etc/airtime/liquidsoap.cfg', 'w')
+    fh.write("################################################\n")
+    fh.write("# THIS FILE IS AUTO GENERATED. DO NOT CHANGE!! #\n")
+    fh.write("################################################\n")
+    fh.write("# The ignore() lines are to squash unused variable warnings\n")
+
+    for key, value in data.iteritems():
+        try:
+            str_buffer = "%s = %s\n" % (key, int(value))
+        except ValueError:
+            try: # Is it a boolean?
+                if "true" in value or "false" in value:
+                    str_buffer = "%s = %s\n" % (key, value.lower())
+                else:
+                    raise ValueError() # Just drop into the except below
+            except: #Everything else is a string
+                str_buffer = "%s = \"%s\"\n" % (key, value)
+
+        fh.write(str_buffer.encode('utf-8'))
+        # ignore squashes unused variable errors from Liquidsoap
+        fh.write(("ignore(%s)\n" % key).encode('utf-8'))
+
+    fh.write('log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"\n')
+    fh.close()
+    
+def run():
+    logging.basicConfig(format='%(message)s')
+    attempts = 0
+    max_attempts = 10
+    successful = False
+    
+    while not successful:
+        try:
+            ac = AirtimeApiClient(logging.getLogger())
+            ss = ac.get_stream_setting()
+            generate_liquidsoap_config(ss)
+            successful = True
+        except Exception, e:
+            print "Unable to connect to the Airtime server."
+            logging.error(str(e))
+            logging.error("traceback: %s", traceback.format_exc())
+            if attempts == max_attempts:
+                logging.error("giving up and exiting...")
+                sys.exit(1)
+            else:
+                logging.info("Retrying in 3 seconds...")
+                time.sleep(3)
+        attempts += 1