From 5a2d55ef849485f06b910746085de6f5458dbe76 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Fri, 13 Apr 2012 16:58:12 -0400
Subject: [PATCH] CC-3520: Change default password of monit

-currently I allow it to be fixed, but I don't actually change it
from default of airtime:guest
---
 airtime_mvc/application/configs/conf.php                 | 4 ++++
 airtime_mvc/application/models/Systemstatus.php          | 9 +++++++--
 .../upgrades/airtime-2.1.0/etc/airtime.conf.210          | 4 ++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index 39ef27fdd..4a8a5a142 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -64,6 +64,10 @@ class Config {
         
         $CC_CONFIG['cache_ahead_hours'] = $values['general']['cache_ahead_hours'];
         
+        
+        $CC_CONFIG['monit_user'] = $values['monit']['monit_user'];
+        $CC_CONFIG['monit_password'] = $values['monit']['monit_password'];
+        
 	    // Database config
         $CC_CONFIG['dsn']['username'] = $values['database']['dbuser'];
         $CC_CONFIG['dsn']['password'] = $values['database']['dbpass'];
diff --git a/airtime_mvc/application/models/Systemstatus.php b/airtime_mvc/application/models/Systemstatus.php
index 18761dc96..679b57c19 100644
--- a/airtime_mvc/application/models/Systemstatus.php
+++ b/airtime_mvc/application/models/Systemstatus.php
@@ -4,20 +4,25 @@ class Application_Model_Systemstatus
 {
 
     public static function GetMonitStatus($p_ip){
+        global $CC_CONFIG;
+        $monit_user = $CC_CONFIG['monit_user'];
+        $monit_password = $CC_CONFIG['monit_password'];
 
         $url = "http://$p_ip:2812/_status?format=xml";
         
         $ch = curl_init(); 
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); 
         curl_setopt($ch, CURLOPT_URL, $url);  
-        curl_setopt($ch, CURLOPT_USERPWD, "guest:airtime");
+        curl_setopt($ch, CURLOPT_USERPWD, "$monit_user:$monit_password");
         //wait a max of 3 seconds before aborting connection attempt
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 3);
         $result = curl_exec($ch);
+        
+        $info = curl_getinfo($ch);
         curl_close($ch);
 
         $docRoot = null;
-        if ($result != FALSE){
+        if ($result !== FALSE && $info["http_code"] === 200){
             if ($result != ""){
                 $xmlDoc = new DOMDocument();
                 $xmlDoc->loadXML($result);
diff --git a/install_minimal/upgrades/airtime-2.1.0/etc/airtime.conf.210 b/install_minimal/upgrades/airtime-2.1.0/etc/airtime.conf.210
index 578c50828..ff287da21 100644
--- a/install_minimal/upgrades/airtime-2.1.0/etc/airtime.conf.210
+++ b/install_minimal/upgrades/airtime-2.1.0/etc/airtime.conf.210
@@ -22,6 +22,10 @@ base_port = 80
 ;cache scheduled media files.
 cache_ahead_hours = 1
 
+[monit]
+user = guest
+password = airtime
+
 [soundcloud]
 connection_retries = 3
 time_between_retries = 60