Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More work on running services as web user

This commit is contained in:
Duncan Sommerville 2015-01-08 13:21:08 -05:00
parent ab35827439
commit e568013db6
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
installer/install
View File

@ -311,14 +311,12 @@ if [ "$icecast" = "t" ]; then
set -e set -e
fi fi
# Do we want to prompt the user here?
loud "\n-----------------------------------------------------" loud "\n-----------------------------------------------------"
loud " * Installing Airtime Services * " loud " * Installing Airtime Services * "
loud "-----------------------------------------------------" loud "-----------------------------------------------------"
verbose "\n * Installing necessary service binaries..." verbose "\n * Installing necessary binaries..."
loudCmd "apt-get -y --force-yes install liquidsoap python python-pip dbus" loudCmd "apt-get -y --force-yes install liquidsoap python python-pip"
loudCmd "pip install setuptools" loudCmd "pip install setuptools"
verbose "...Done" 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 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/* chmod 644 /etc/init/airtime/*
service dbus restart
initctl reload-configuration initctl reload-configuration
service airtime-session-init start service airtime-session-init start
if [ ! -d /var/log/airtime ]; then if [ ! -d /var/log/airtime ]; then

2
installer/lib/airtime-session-init.conf
View File

@ -9,5 +9,5 @@ script
export XDG_RUNTIME_DIR="/run/airtime" export XDG_RUNTIME_DIR="/run/airtime"
export HOME 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 end script

2
installer/lxc-bootstrap
View File

@ -22,7 +22,7 @@ echo "...Done"
set -e set -e
echo -e "\n * Creating ${name} with dist ${dist} and release ${release}..." 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 "...Done"
echo -e "\n * Starting ${name}..." echo -e "\n * Starting ${name}..."

2
python_apps/media-monitor/setup.py
View File

@ -12,7 +12,7 @@ if '--no-init-script' in sys.argv:
data_files = [] data_files = []
sys.argv.remove('--no-init-script') # super hax sys.argv.remove('--no-init-script') # super hax
else: 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 print data_files
setup(name='airtime-media-monitor', setup(name='airtime-media-monitor',

2
python_apps/pypo/setup.py
View File

@ -12,7 +12,7 @@ if '--no-init-script' in sys.argv:
data_files = [] data_files = []
sys.argv.remove('--no-init-script') # super hax sys.argv.remove('--no-init-script') # super hax
else: 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 print data_files
setup(name='airtime-playout', setup(name='airtime-playout',