From 9c324c1b6fce59a4483b58b21d309bd030a4bdc8 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Fri, 19 Dec 2014 11:58:47 -0500
Subject: [PATCH] Updated configuration checklist

---
 .../application/configs/config-check.php        |  5 +++--
 airtime_mvc/build/airtime-setup/load.php        | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/configs/config-check.php b/airtime_mvc/application/configs/config-check.php
index 475108122..41ed1bf17 100644
--- a/airtime_mvc/application/configs/config-check.php
+++ b/airtime_mvc/application/configs/config-check.php
@@ -209,9 +209,10 @@ $result = $r1 && $r2;
     if (!$result) {
         ?>
         <br/>
+        <strong>Looks like something went wrong!</strong>
         <p>
-            Looks like something went wrong! If you've tried everything we've recommended in the table above and are 
-            still experiencing issues, come <a href="https://forum.sourcefabric.org/">visit our forums</a>
+            If you've tried everything we've recommended above and are  still experiencing issues, come 
+            <a href="https://forum.sourcefabric.org/">visit our forums</a>
             or <a href="http://www.sourcefabric.org/en/airtime/manuals/">check out the manual</a>.
         </p>
     <?php
diff --git a/airtime_mvc/build/airtime-setup/load.php b/airtime_mvc/build/airtime-setup/load.php
index 6730c4911..d3a4a6c6c 100644
--- a/airtime_mvc/build/airtime-setup/load.php
+++ b/airtime_mvc/build/airtime-setup/load.php
@@ -99,6 +99,8 @@ function configureDatabase() {
 
 /**
  * Check that we can connect to RabbitMQ
+ * 
+ * @return true if the RabbitMQ connection can be established
  */
 function checkRMQConnection() {
     // Check for airtime.conf in /etc/airtime/ first, then check in the build directory,
@@ -116,16 +118,31 @@ function checkRMQConnection() {
     return isset($conn);
 }
 
+/**
+ * Check if airtime-media-monitor is currently running
+ * 
+ * @return boolean true if airtime-media-monitor is running
+ */
 function checkMediaMonitorService() {
     exec("initctl list | grep airtime-media-monitor", $out, $status);
     return $status == 0;
 }
 
+/**
+ * Check if airtime-playout is currently running
+ * 
+ * @return boolean true if airtime-playout is running
+ */
 function checkPlayoutService() {
     exec("initctl list | grep airtime-playout", $out, $status);
         return $status == 0;
 }
 
+/**
+ * Check if airtime-liquidsoap is currently running
+ * 
+ * @return boolean true if airtime-liquidsoap is running
+ */
 function checkLiquidsoapService() {
     exec("initctl list | grep airtime-liquidsoap", $out, $status);
         return $status == 0;