From 54748b627586ebd3a4592d508c1ce38efa02e4f7 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Fri, 19 Dec 2014 17:16:50 -0500
Subject: [PATCH] More work on media-monitor and pypo install process

---
 installer/install                             | 20 +++----------------
 .../media-monitor/bin/airtime-media-monitor   | 13 +-----------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/installer/install b/installer/install
index 27913705f..85aac0b15 100755
--- a/installer/install
+++ b/installer/install
@@ -370,28 +370,14 @@ else
 fi
 verbose "...Done"
 
-verbose "\n * Creating sudoers files..."
+verbose "\n * Creating sudoers file..."
 # sed -e "s/WEB_USER/${web_user}/g" /usr/lib/airtime/media-monitor/airtime-media-monitor-init-d > /etc/init.d/airtime-media-monitor
 touch /etc/sudoers.d/airtime-media-monitor_${web_user}
-echo "${web_user} ALL = (root) NOPASSWD: /sbin/start    airtime-media-monitor, \
-/sbin/stop airtime-media-monitor, \
-/sbin/restart airtime-media-monitor, \
-/sbin/status airtime-media-monitor" > /etc/sudoers.d/airtime-media-monitor_${web_user}
-
+echo "${web_user} ALL = (root) NOPASSWD: /sbin/service airtime-media-monitor *, \
+/sbin/service airtime-playout *, /sbin/service airtime-liquidsoap *, \" > /etc/sudoers.d/service_${web_user}
 # sed -e "s/WEB_USER/${web_user}/g" /usr/lib/airtime/pypo/bin/airtime-playout-init-d > /etc/init.d/airtime-playout
-touch /etc/sudoers.d/airtime-playout_${web_user}
-echo "${web_user} ALL = (root) NOPASSWD: /sbin/start airtime-playout, \
-/sbin/stop airtime-playout, \
-/sbin/restart airtime-playout, \
-/sbin/status airtime-playout" > /etc/sudoers.d/airtime-playout_${web_user}
-
 ln -sf /usr/bin/liquidsoap /usr/bin/airtime-liquidsoap
 # sed -e "s/WEB_USER/${web_user}/g" /usr/lib/airtime/pypo/bin/airtime-liquidsoap-init-d > /etc/init.d/airtime-liquidsoap
-touch /etc/sudoers.d/airtime-liquidsoap_${web_user}
-echo "${web_user} ALL = (root) NOPASSWD: /sbin/start airtime-liquidsoap, \
-/sbin/stop airtime-liquidsoap, \
-/sbin/restart airtime-liquidsoap, \
-/sbin/status airtime-liquidsoap" > /etc/sudoers.d/airtime-liquidsoap_${web_user}
 verbose "...Done"
 
 initctl reload-configuration
diff --git a/python_apps/media-monitor/bin/airtime-media-monitor b/python_apps/media-monitor/bin/airtime-media-monitor
index 5997e8db4..6a3692a7b 100755
--- a/python_apps/media-monitor/bin/airtime-media-monitor
+++ b/python_apps/media-monitor/bin/airtime-media-monitor
@@ -2,16 +2,6 @@
 
 # Location of pypo_cli.py Python script
 
-virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
-. ${virtualenv_bin}activate
-
-media_monitor_path="/usr/lib/airtime/media-monitor/"
-media_monitor_script="media_monitor.py"
-
-api_client_path="/usr/lib/airtime/:/usr/lib/airtime/media-monitor/mm2/"
-
-cd ${media_monitor_path}
-
 exec 2>&1
 
 set +e
@@ -22,9 +12,8 @@ if [ "$?" != "0" ]; then
     exit 1
 fi
 
-export PYTHONPATH=${api_client_path}
 export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""`
 
-exec python ${media_monitor_path}${media_monitor_script} > /var/log/airtime/media-monitor/py-interpreter.log 2>&1
+exec python /usr/lib/airtime/media-monitor/media_monitor.py > /var/log/airtime/media-monitor/py-interpreter.log 2>&1
 
 # EOF