From 344e1aa194b37c45f02070bc336c42ec704fa8c9 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Mon, 5 Jan 2015 09:30:08 -0500
Subject: [PATCH] Test to start upstart jobs as web user
---
installer/install | 1 -
python_apps/media-monitor/install/airtime-media-monitor.conf | 2 +-
python_apps/pypo/install/airtime-playout.conf | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/installer/install b/installer/install
index 5ebc79aa6..83f2ec7a2 100755
--- a/installer/install
+++ b/installer/install
@@ -372,7 +372,6 @@ verbose "...Done"
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 = (ALL) 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
diff --git a/python_apps/media-monitor/install/airtime-media-monitor.conf b/python_apps/media-monitor/install/airtime-media-monitor.conf
index f1cc6be8b..58de249af 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
+exec sudo -u www-data "airtime-media-monitor"
\ No newline at end of file
diff --git a/python_apps/pypo/install/airtime-playout.conf b/python_apps/pypo/install/airtime-playout.conf
index bbd8da1a2..fadaed75d 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
+exec sudo -u www-data "airtime-playout"
\ No newline at end of file