From a790527e675967fd899ce22e1bfd3701f48ae0de Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 8 Jan 2015 10:06:37 -0500
Subject: [PATCH] More work on running upstart services as non-privileged user

---
 installer/install                                            | 3 +++
 installer/{bin => lib}/requirements-ubuntu-saucy.apt         | 0
 installer/{bin => lib}/requirements-ubuntu-trusty.apt        | 0
 python_apps/media-monitor/install/airtime-media-monitor.conf | 2 +-
 python_apps/media-monitor/setup.py                           | 2 +-
 python_apps/pypo/install/airtime-liquidsoap.conf             | 2 +-
 python_apps/pypo/install/airtime-playout.conf                | 2 +-
 python_apps/pypo/setup.py                                    | 2 +-
 8 files changed, 8 insertions(+), 5 deletions(-)
 rename installer/{bin => lib}/requirements-ubuntu-saucy.apt (100%)
 rename installer/{bin => lib}/requirements-ubuntu-trusty.apt (100%)

diff --git a/installer/install b/installer/install
index 0168d5348..9873ff0d3 100755
--- a/installer/install
+++ b/installer/install
@@ -374,6 +374,9 @@ verbose "\n * Creating liquidsoap symlink..."
 ln -sf /usr/bin/liquidsoap /usr/bin/airtime-liquidsoap
 verbose "...Done"
 
+sed "s@WEB_USER@${web_user}@g" ${SCRIPT_DIR}/lib/Upstart.conf > /etc/dbus-1/system.d/Upstart.conf
+
+service dbus restart
 initctl reload-configuration
 
 if [ ! -d /var/log/airtime ]; then
diff --git a/installer/bin/requirements-ubuntu-saucy.apt b/installer/lib/requirements-ubuntu-saucy.apt
similarity index 100%
rename from installer/bin/requirements-ubuntu-saucy.apt
rename to installer/lib/requirements-ubuntu-saucy.apt
diff --git a/installer/bin/requirements-ubuntu-trusty.apt b/installer/lib/requirements-ubuntu-trusty.apt
similarity index 100%
rename from installer/bin/requirements-ubuntu-trusty.apt
rename to installer/lib/requirements-ubuntu-trusty.apt
diff --git a/python_apps/media-monitor/install/airtime-media-monitor.conf b/python_apps/media-monitor/install/airtime-media-monitor.conf
index d4d070c98..20b611aa5 100755
--- 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 su -s /bin/sh -c 'exec airtime-media-monitor' www-data -- init --user
\ No newline at end of file
+exec airtime-media-monitor
\ No newline at end of file
diff --git a/python_apps/media-monitor/setup.py b/python_apps/media-monitor/setup.py
index 6b4e37bdf..c35c36131 100755
--- a/python_apps/media-monitor/setup.py
+++ b/python_apps/media-monitor/setup.py
@@ -12,7 +12,7 @@ if '--no-init-script' in sys.argv:
     data_files = []
     sys.argv.remove('--no-init-script') # super hax
 else:
-    data_files = [('/usr/share/upstart/sessions', ['install/airtime-media-monitor.conf'])]
+    data_files = [('/etc/init', ['install/airtime-media-monitor.conf'])]
     print data_files
 
 setup(name='airtime-media-monitor',
diff --git a/python_apps/pypo/install/airtime-liquidsoap.conf b/python_apps/pypo/install/airtime-liquidsoap.conf
index fed89f275..e60835dea 100755
--- 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 su -s /bin/sh -c 'exec airtime-liquidsoap' www-data -- init --user
+exec airtime-liquidsoap
diff --git a/python_apps/pypo/install/airtime-playout.conf b/python_apps/pypo/install/airtime-playout.conf
index 2b5b8c1e1..7d13a436e 100755
--- 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 su -s /bin/sh -c 'exec airtime-playout' www-data -- init --user
\ No newline at end of file
+exec airtime-playout
\ No newline at end of file
diff --git a/python_apps/pypo/setup.py b/python_apps/pypo/setup.py
index 7992d9383..955e75cce 100755
--- a/python_apps/pypo/setup.py
+++ b/python_apps/pypo/setup.py
@@ -12,7 +12,7 @@ if '--no-init-script' in sys.argv:
     data_files = []
     sys.argv.remove('--no-init-script') # super hax
 else:
-    data_files = [('/usr/share/upstart/sessions', ['install/airtime-playout.conf', 'install/airtime-liquidsoap.conf'])]
+    data_files = [('/etc/init', ['install/airtime-playout.conf', 'install/airtime-liquidsoap.conf'])]
     print data_files
 
 setup(name='airtime-playout',