From fc68dfa256186997b2fae43c2073862977471a1b Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Mon, 5 Jan 2015 11:16:58 -0500
Subject: [PATCH] Fixed service execution calls

---
 airtime_mvc/public/setup/finish-setup.php                   | 6 +++---
 installer/install                                           | 4 ----
 .../media-monitor/install/airtime-media-monitor.conf        | 2 +-
 python_apps/pypo/install/airtime-liquidsoap.conf            | 2 +-
 python_apps/pypo/install/airtime-playout.conf               | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/public/setup/finish-setup.php b/airtime_mvc/public/setup/finish-setup.php
index 3d35fee7b..bcbd9e087 100644
--- a/airtime_mvc/public/setup/finish-setup.php
+++ b/airtime_mvc/public/setup/finish-setup.php
@@ -50,9 +50,9 @@ class FinishSetup extends Setup {
     }
     
     function startServices() {
-        exec("service airtime-media-monitor start-with-monit");
-        exec("service airtime-playout start-with-monit");
-        exec("service airtime-liquidsoap start-with-monit");
+        exec("service airtime-media-monitor start");
+        exec("service airtime-playout start");
+        exec("service airtime-liquidsoap start");
     }
 
 }
\ No newline at end of file
diff --git a/installer/install b/installer/install
index 93c4596d9..288820e8d 100755
--- a/installer/install
+++ b/installer/install
@@ -371,10 +371,6 @@ fi
 verbose "...Done"
 
 verbose "\n * Creating sudoers file..."
-echo "${web_user} ALL = (root) NOPASSWD: \
-/sbin/start airtime-media-monitor, /sbin/stop airtime-media-monitor, \
-/sbin/start airtime-playout, /sbin/stop airtime-playout, \
-/sbin/start airtime-liquidsoap, /sbin/stop airtime-liquidsoap" > /etc/sudoers.d/service_${web_user}
 ln -sf /usr/bin/liquidsoap /usr/bin/airtime-liquidsoap
 verbose "...Done"
 
diff --git a/python_apps/media-monitor/install/airtime-media-monitor.conf b/python_apps/media-monitor/install/airtime-media-monitor.conf
index e456a2ba1..20b611aa5 100644
--- a/python_apps/media-monitor/install/airtime-media-monitor.conf
+++ b/python_apps/media-monitor/install/airtime-media-monitor.conf
@@ -12,4 +12,4 @@ setgid www-data
 env LANG='en_US.UTF-8'
 env LC_ALL='en_US.UTF-8'
 
-exec "airtime-media-monitor"
\ No newline at end of file
+exec airtime-media-monitor
\ No newline at end of file
diff --git a/python_apps/pypo/install/airtime-liquidsoap.conf b/python_apps/pypo/install/airtime-liquidsoap.conf
index 2a7a87cf9..e60835dea 100644
--- a/python_apps/pypo/install/airtime-liquidsoap.conf
+++ b/python_apps/pypo/install/airtime-liquidsoap.conf
@@ -12,4 +12,4 @@ setgid www-data
 env LANG='en_US.UTF-8'
 env LC_ALL='en_US.UTF-8'
 
-exec "airtime-liquidsoap"
+exec airtime-liquidsoap
diff --git a/python_apps/pypo/install/airtime-playout.conf b/python_apps/pypo/install/airtime-playout.conf
index ee57b218b..7d13a436e 100644
--- a/python_apps/pypo/install/airtime-playout.conf
+++ b/python_apps/pypo/install/airtime-playout.conf
@@ -12,4 +12,4 @@ setgid www-data
 env LANG='en_US.UTF-8'
 env LC_ALL='en_US.UTF-8'
 
-exec "airtime-playout"
\ No newline at end of file
+exec airtime-playout
\ No newline at end of file