From 8a353f970c262cbb6d5c780becebcf5ddf4ffd2b Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Tue, 16 Dec 2014 15:45:35 -0500
Subject: [PATCH] More work on monitless installer

---
 installer/install                          | 18 ++++++++++++++----
 python_apps/pypo/airtime-liquidsoap-init-d |  4 ++--
 python_apps/pypo/airtime-playout-init-d    |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/installer/install b/installer/install
index 603890abf..02da1ffb3 100755
--- a/installer/install
+++ b/installer/install
@@ -319,18 +319,20 @@ loud "\n-----------------------------------------------------"
 loud "             * Installing Python Apps *              "
 loud "-----------------------------------------------------"
 
-verbose "\n * Installing virtualenv..."
-loudCmd "$AIRTIMEROOT/python_apps/python-virtualenv/virtualenv-install.sh"
-
-verbose "\n * Installing liquidsoap..."
 loudCmd "apt-get -y --force-yes install liquidsoap"
 
+verbose "\n * Creating /usr/lib/airtime..."
+mkdir -p /usr/lib/airtime
+verbose "...Done"
+
 verbose "\n * Installing API client..."
 cp -R ${AIRTIMEROOT}/python_apps/api_clients /usr/lib/airtime/api_clients
+verbose "...Done"
 
 verbose "\n * Copying media-monitor files..."
 cp -R ${AIRTIMEROOT}/python_apps/media-monitor /usr/lib/airtime/media-monitor
 cp -R ${AIRTIMEROOT}/python_apps/media-monitor2 /usr/lib/airtime/media-monitor/mm2
+verbose "...Done"
 
 sed -e "s/WEB_USER/${web_user}/g" /usr/lib/airtime/media-monitor/airtime-media-monitor-init-d > /etc/init.d/airtime-media-monitor
 touch /etc/sudoers.d/airtime-media-monitor_${web_user}
@@ -340,8 +342,11 @@ echo "${web_user} ALL = (root) NOPASSWD: /sbin/start    airtime-media-monitor, \
                                          /sbin/status   airtime-media-monitor" > /etc/sudoers.d/airtime-media-monitor_${web_user}
 
 verbose "\n * Copying pypo files..."
+mkdir -p /usr/lib/airtime/pypo
 cp -R ${AIRTIMEROOT}/python_apps/pypo /usr/lib/airtime/pypo/bin/
+verbose "...Done"
 
+verbose "\n * Creating init files..."
 sed -e "s/WEB_USER/${web_user}/g" /usr/lib/airtime/pypo/bin/airtime-playout-init-d > /etc/init.d/airtime-playout
 touch /etc/sudoers.d/airtime-playout_${web_user}
 echo "${web_user} ALL = (root) NOPASSWD: /sbin/start    airtime-playout, \
@@ -349,12 +354,17 @@ echo "${web_user} ALL = (root) NOPASSWD: /sbin/start    airtime-playout, \
                                          /sbin/restart  airtime-playout, \
                                          /sbin/status   airtime-playout" > /etc/sudoers.d/airtime-playout_${web_user}
 
+ln -sf /usr/bin/airtime-liquidsoap /usr/bin/liquidsoap
 sed -e "s/WEB_USER/${web_user}/g" /usr/lib/airtime/pypo/bin/airtime-liquidsoap-init-d > /etc/init.d/airtime-liquidsoap
 touch /etc/sudoers.d/airtime-liquidsoap_${web_user}
 echo "${web_user} ALL = (root) NOPASSWD: /sbin/start    airtime-liquidsoap, \
                                          /sbin/stop     airtime-liquidsoap, \
                                          /sbin/restart  airtime-liquidsoap, \
                                          /sbin/status   airtime-liquidsoap" > /etc/sudoers.d/airtime-liquidsoap_${web_user}
+verbose "...Done"
+
+chmod 700 /etc/init.d/airtime-*
+initctl reload-configuration
 
 # Do we need to run the init scripts for media-monitor and pypo here?
 
diff --git a/python_apps/pypo/airtime-liquidsoap-init-d b/python_apps/pypo/airtime-liquidsoap-init-d
index f8b749c2b..a7d85a745 100755
--- a/python_apps/pypo/airtime-liquidsoap-init-d
+++ b/python_apps/pypo/airtime-liquidsoap-init-d
@@ -9,8 +9,8 @@
 # Short-Description: Liquidsoap daemon
 ### END INIT INFO
 
-USERID=pypo
-GROUPID=pypo
+USERID=WEB_USER
+GROUPID=WEB_USER
 NAME="Liquidsoap Playout Engine"
 
 DAEMON=/usr/lib/airtime/pypo/bin/airtime-liquidsoap
diff --git a/python_apps/pypo/airtime-playout-init-d b/python_apps/pypo/airtime-playout-init-d
index 1d760d43a..cf3cbfd91 100755
--- a/python_apps/pypo/airtime-playout-init-d
+++ b/python_apps/pypo/airtime-playout-init-d
@@ -9,7 +9,7 @@
 # Short-Description: Manage airtime-playout daemon
 ### END INIT INFO
 
-USERID=root
+USERID=WEB_USER
 NAME="Airtime Scheduler"
 
 DAEMON=/usr/lib/airtime/pypo/bin/airtime-playout