From e6d8a6f25ebc9adbe8a3b525b913e92f6e183b53 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 7 Jan 2015 16:04:48 -0500 Subject: [PATCH] Move upstart .conf files to directory accessible by non-privileged users --- installer/lxc-bootstrap | 2 +- python_apps/media-monitor/bin/airtime-media-monitor | 1 - python_apps/media-monitor/setup.py | 2 +- python_apps/pypo/setup.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/installer/lxc-bootstrap b/installer/lxc-bootstrap index f0c72a698..aebefaba3 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 ${dist} -n ${name} -- --release ${release} --arch amd64 +lxc-create -t download -n ${name} -- --dist ${dist} --release ${release} --arch amd64 echo "...Done" echo -e "\n * Starting ${name}..." diff --git a/python_apps/media-monitor/bin/airtime-media-monitor b/python_apps/media-monitor/bin/airtime-media-monitor index 2f51e3d2c..a76b10d52 100755 --- a/python_apps/media-monitor/bin/airtime-media-monitor +++ b/python_apps/media-monitor/bin/airtime-media-monitor @@ -14,7 +14,6 @@ fi export PYTHONPATH=/usr/lib/airtime/:/usr/lib/airtime/media-monitor/airtimefilemonitor/:\ /usr/lib/airtime/media-monitor/mm2/:/usr/lib/airtime/std_err_override/:/usr/lib/airtime/api_clients:$PYTHONPATH -export PYTHONPATH="/usr/lib/airtime/:/usr/lib/airtime/media-monitor/mm2/" export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""` exec python /usr/lib/airtime/media-monitor/media_monitor.py > /var/log/airtime/media-monitor/py-interpreter.log 2>&1 diff --git a/python_apps/media-monitor/setup.py b/python_apps/media-monitor/setup.py index c35c36131..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', ['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 955e75cce..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', ['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',