More work on running upstart services as non-privileged user

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

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
+exec airtime-media-monitor

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',

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

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
+exec airtime-playout

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',