From 56fa147b6f63009c37889236694f387865fe80cb Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 8 May 2012 15:32:45 -0400
Subject: [PATCH] CC-3785: Make sure /srv/airtime has ownership root:www-data
 and permissions 02775 in upgrade script

-fixed
---
 .../upgrades/airtime-2.1.0/MiscUpgrade.php            | 11 ++++++++++-
 .../upgrades/airtime-2.1.0/airtime-upgrade.php        |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php b/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php
index 327f35f65..d1714b86a 100644
--- a/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php
@@ -3,7 +3,9 @@
 /* Stuff not related to upgrading database +
  * config files goes here. */
 class AirtimeMiscUpgrade{
-    public static function start(){
+    public static function start($p_ini){
+        self::adjustMonitCfgPermissions();
+        self::adjustAirtimeStorPermissions($p_ini);
     }
     
     public static function adjustMonitCfgPermissions(){
@@ -15,4 +17,11 @@ class AirtimeMiscUpgrade{
         chmod("/etc/monit/conf.d/monit-airtime-playout.cfg", 0600);
         chmod("/etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg", 0600);
     }
+    
+    public static function adjustAirtimeStorPermissions($p_ini){
+        /* Make the read permission of Monit cfg files more strict */
+        $webUser = $p_ini["general"]["web_server_user"];
+        exec("chown -R root:$webUser");
+        exec("chmod -R 2775 /srv/airtime");
+    }
 }
diff --git a/install_minimal/upgrades/airtime-2.1.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.1.0/airtime-upgrade.php
index 5265b0c6b..4117503aa 100644
--- a/install_minimal/upgrades/airtime-2.1.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-2.1.0/airtime-upgrade.php
@@ -58,4 +58,4 @@ UpgradeCommon::SetDefaultTimezone();
 
 AirtimeConfigFileUpgrade::start();
 AirtimeDatabaseUpgrade::start($values);
-AirtimeMiscUpgrade::start();
+AirtimeMiscUpgrade::start($values);