From 1ddda846d6df72fd12b3f0cf566d978f31458c5a Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Thu, 8 Jan 2015 18:52:58 -0500 Subject: [PATCH] Updates to running background services as web user --- airtime_mvc/application/configs/config-check.php | 7 +++---- installer/install | 5 +++-- installer/lib/airtime-session-init.conf | 12 +++++++----- 3 files changed, 13 insertions(+), 11 deletions(-) mode change 100644 => 100755 installer/lib/airtime-session-init.conf diff --git a/airtime_mvc/application/configs/config-check.php b/airtime_mvc/application/configs/config-check.php index 41ed1bf17..90f0f47f8 100755 --- a/airtime_mvc/application/configs/config-check.php +++ b/airtime_mvc/application/configs/config-check.php @@ -150,10 +150,9 @@ $result = $r1 && $r2; "> - Check that the airtime-media-monitor service is installed correctly in /etc/init - and /etc/init.d, and ensure that it's running with -
sudo initctl list | grep airtime-media-monitor. If not, try -
sudo -u www-data service airtime-media-monitor restart. + Check that the airtime-media-monitor service is installed correctly in /etc/init, + and ensure that it's running in
initctl list | grep airtime-media-monitor
. + If not, try
sudo service airtime-media-monitor start
. (Replace www-data with your web user if necessary) /etc/init/airtime-session-init.conf +sed "s@WEB_USER@${web_user}@g" ${SCRIPT_DIR}/lib/airtime-session-init-setup.conf > /etc/init/airtime-session-init-setup.conf +cp ${SCRIPT_DIR}/lib/airtime-session-init.conf /etc/init/airtime-session-init.conf chmod 644 /usr/share/upstart/sessions/airtime* initctl reload-configuration -service airtime-session-init start +service airtime-session-init-setup start if [ ! -d /var/log/airtime ]; then loud "\n-----------------------------------------------------" diff --git a/installer/lib/airtime-session-init.conf b/installer/lib/airtime-session-init.conf old mode 100644 new mode 100755 index d36218523..2cbfe73b0 --- a/installer/lib/airtime-session-init.conf +++ b/installer/lib/airtime-session-init.conf @@ -1,13 +1,15 @@ -instance WEB_USER +instance $user stop on runlevel [016] script - uid=WEB_USER - HOME=WEB_ROOT + uid=$(getent passwd "$user"|cut -d: -f3) + HOME=$(getent passwd "$user"|cut -d: -f6) - export XDG_RUNTIME_DIR="/run/airtime" + export XDG_RUNTIME_DIR="/run/user/$uid" export HOME + + echo $HOME - exec su -s /bin/sh -c 'exec "$0" "$@"' WEB_USER -- init --user + exec su -s /bin/sh -c 'exec "$0" "$@"' $user -- init --user --confdir /usr/share/upstart/sessions/ end script \ No newline at end of file