From ca4cbb0ce14713d0a2896790cb0345f2e58243e7 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 10 May 2012 15:46:01 -0400 Subject: [PATCH] CC-3798: Upgrade from 1.9.0 to 2.1.0 in lucid: warning message -fixed --- install_minimal/include/airtime-initialize.sh | 6 ++++++ .../upgrades/airtime-2.1.0/MiscUpgrade.php | 11 ----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/install_minimal/include/airtime-initialize.sh b/install_minimal/include/airtime-initialize.sh index 761f09cc3..0651643d3 100755 --- a/install_minimal/include/airtime-initialize.sh +++ b/install_minimal/include/airtime-initialize.sh @@ -21,6 +21,12 @@ if [ "$pypo" = "t" ]; then python $AIRTIMEROOT/python_apps/pypo/install/pypo-initialize.py fi +chmod 600 /etc/monit/conf.d/monit-airtime-generic.cfg +chmod 600 /etc/monit/conf.d/monit-airtime-liquidsoap.cfg +chmod 600 /etc/monit/conf.d/monit-airtime-media-monitor.cfg +chmod 600 /etc/monit/conf.d/monit-airtime-playout.cfg +chmod 600 /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg + # Start monit if it is not running, or restart if it is. # Need to ensure monit is running before Airtime daemons are run. This is # so we can ensure they can register with monit to monitor them when they start. diff --git a/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php b/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php index d1714b86a..5b863629a 100644 --- a/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php +++ b/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php @@ -4,20 +4,9 @@ * config files goes here. */ class AirtimeMiscUpgrade{ public static function start($p_ini){ - self::adjustMonitCfgPermissions(); self::adjustAirtimeStorPermissions($p_ini); } - - public static function adjustMonitCfgPermissions(){ - /* Make the read permission of Monit cfg files more strict */ - chmod("/etc/monit/conf.d/monit-airtime-generic.cfg", 0600); - chmod("/etc/monit/conf.d/monit-airtime-liquidsoap.cfg", 0600); - chmod("/etc/monit/conf.d/monit-airtime-media-monitor.cfg", 0600); - 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"];