From f35fb4968c503af1fad3761eebb68176c1b9e884 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Mon, 5 Jan 2015 09:47:06 -0500
Subject: [PATCH] Test to start upstart jobs as web user
---
installer/install | 4 ++--
python_apps/pypo/install/airtime-liquidsoap.conf | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/installer/install b/installer/install
index 83f2ec7a2..f5e15a4c3 100755
--- a/installer/install
+++ b/installer/install
@@ -372,8 +372,8 @@ 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
-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}
+# 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
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
diff --git a/python_apps/pypo/install/airtime-liquidsoap.conf b/python_apps/pypo/install/airtime-liquidsoap.conf
index e60835dea..e49f5f81e 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 sudo -u www-data "airtime-liquidsoap"