From e568013db605e3e12f0062eebd95258dd922473d Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 8 Jan 2015 13:21:08 -0500
Subject: [PATCH] More work on running services as web user
---
installer/install | 8 ++------
installer/lib/airtime-session-init.conf | 2 +-
installer/lxc-bootstrap | 2 +-
python_apps/media-monitor/setup.py | 2 +-
python_apps/pypo/setup.py | 2 +-
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/installer/install b/installer/install
index 2e83bd98d..3e5d2b156 100755
--- a/installer/install
+++ b/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
diff --git a/installer/lib/airtime-session-init.conf b/installer/lib/airtime-session-init.conf
index 7b0af74c7..d36218523 100644
--- a/installer/lib/airtime-session-init.conf
+++ b/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
\ No newline at end of file
diff --git a/installer/lxc-bootstrap b/installer/lxc-bootstrap
index aebefaba3..b5e18796c 100755
--- a/installer/lxc-bootstrap
+++ b/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}..."
diff --git a/python_apps/media-monitor/setup.py b/python_apps/media-monitor/setup.py
index 3f8c04444..6b4e37bdf 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 = [('/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',
diff --git a/python_apps/pypo/setup.py b/python_apps/pypo/setup.py
index 542332324..7992d9383 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 = [('/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',