From ee96380a41b9ba1072977d2e8336d59b4e649d82 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 5 Jan 2015 10:16:44 -0500 Subject: [PATCH] Test to start upstart jobs as web user --- installer/install | 6 ++++-- .../media-monitor/install/airtime-media-monitor.conf | 2 +- python_apps/pypo/install/airtime-liquidsoap.conf | 2 +- python_apps/pypo/install/airtime-playout.conf | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/installer/install b/installer/install index f5e15a4c3..0b4319a5e 100755 --- a/installer/install +++ b/installer/install @@ -372,8 +372,10 @@ 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/start airtime-media-monitor *, /sbin/stop airtime-media-monitor, \ +/sbin/start airtime-playout, /sbin/start airtime-playout, \ +/sbin/start airtime-liquidsoap, /sbin/stop 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/media-monitor/install/airtime-media-monitor.conf b/python_apps/media-monitor/install/airtime-media-monitor.conf index 58de249af..e456a2ba1 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 sudo -u www-data "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 e49f5f81e..2a7a87cf9 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 sudo -u www-data "airtime-liquidsoap" +exec "airtime-liquidsoap" diff --git a/python_apps/pypo/install/airtime-playout.conf b/python_apps/pypo/install/airtime-playout.conf index fadaed75d..ee57b218b 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 sudo -u www-data "airtime-playout" \ No newline at end of file +exec "airtime-playout" \ No newline at end of file