More work on running services as web user

installer/install

@@ -311,14 +311,12 @@ if [ "$icecast" = "t" ]; then
     set -e
 fi
 
-# Do we want to prompt the user here?
-
 loud "\n-----------------------------------------------------"
 loud "          * Installing Airtime Services *            "
 loud "-----------------------------------------------------"
 
-verbose "\n * Installing necessary service binaries..."
-loudCmd "apt-get -y --force-yes install liquidsoap python python-pip dbus"
+verbose "\n * Installing necessary binaries..."
+loudCmd "apt-get -y --force-yes install liquidsoap python python-pip"
 loudCmd "pip install setuptools"
 verbose "...Done"
 
@@ -377,9 +375,7 @@ verbose "...Done"
 sed "s@WEB_USER@${web_user}@g;s@WEB_ROOT@${web_root}@g" ${SCRIPT_DIR}/lib/airtime-session-init.conf > /etc/init/airtime-session-init.conf
 chmod 644 /etc/init/airtime/*
 
-service dbus restart
 initctl reload-configuration
-
 service airtime-session-init start
 
 if [ ! -d /var/log/airtime ]; then

installer/lib/airtime-session-init.conf

@@ -9,5 +9,5 @@ script
   export XDG_RUNTIME_DIR="/run/airtime"
   export HOME
 
-  exec su -s /bin/sh -c 'exec "$0" "$@"' $USER -- init --user --confdir /etc/init/airtime
+  exec su -s /bin/sh -c 'exec "$0" "$@"' WEB_USER -- init --user
 end script

installer/lxc-bootstrap

@@ -22,7 +22,7 @@ echo "...Done"
 set -e
 
 echo -e "\n * Creating ${name} with dist ${dist} and release ${release}..."
-lxc-create -t download -n ${name} -- --dist ${dist} --release ${release} --arch amd64
+lxc-create -t ${dist} -n ${name} -- --release ${release}
 echo "...Done"
 
 echo -e "\n * Starting ${name}..."

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 = [('/etc/init/airtime', ['install/airtime-media-monitor.conf'])]
+    data_files = [('/usr/share/upstart/sessions', ['install/airtime-media-monitor.conf'])]
     print data_files
 
 setup(name='airtime-media-monitor',

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 = [('/etc/init/airtime', ['install/airtime-playout.conf', 'install/airtime-liquidsoap.conf'])]
+    data_files = [('/usr/share/upstart/sessions', ['install/airtime-playout.conf', 'install/airtime-liquidsoap.conf'])]
     print data_files
 
 setup(name='airtime-playout',