From 4043ebfd25d99955c7ff1d1b46a8f49cb20957a5 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Tue, 16 Dec 2014 16:26:58 -0500
Subject: [PATCH] More work on monitless installer

---
 .../application/configs/config-check.php      |  2 +-
 installer/install                             | 33 +++++++++++--------
 .../airtime-media-monitor-init-d              |  2 +-
 python_apps/pypo/airtime-liquidsoap-init-d    |  2 +-
 python_apps/pypo/airtime-playout-init-d       |  2 +-
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/airtime_mvc/application/configs/config-check.php b/airtime_mvc/application/configs/config-check.php
index 58176f355..b7b28e72e 100644
--- a/airtime_mvc/application/configs/config-check.php
+++ b/airtime_mvc/application/configs/config-check.php
@@ -130,7 +130,7 @@ $result = $r && $database;
     } else {
         ?>
         <p>
-            Your Airtime station is up and running!
+            Your Airtime station is up and running! Get started by logging in with the default username and password: 'admin'/'admin'
         </p>
         <button onclick="location = location.pathname;">Log in to Airtime!</button>
     <?php
diff --git a/installer/install b/installer/install
index d8784c0a8..50026996f 100755
--- a/installer/install
+++ b/installer/install
@@ -316,15 +316,22 @@ fi
 
 
 loud "\n-----------------------------------------------------"
-loud "             * Installing Python Apps *              "
+loud "          * Installing Airtime Services *            "
 loud "-----------------------------------------------------"
 
-loudCmd "apt-get -y --force-yes install liquidsoap"
+loudCmd "apt-get -y --force-yes install liquidsoap python python-virtaulenv"
+loudCmd "$AIRTIMEROOT/python_apps/python-virtualenv/virtualenv-install.sh"
 
 verbose "\n * Creating /usr/lib/airtime..."
 mkdir -p /usr/lib/airtime
 verbose "...Done"
 
+verbose "\n * Creating /usr/lib/airtime..."
+mkdir -p /run/airtime
+chmod 755 /run/airtime
+chown -R ${web_user}:${web_user} /run/airtime
+verbose "...Done"
+
 verbose "\n * Installing API client..."
 cp -R ${AIRTIMEROOT}/python_apps/api_clients /usr/lib/airtime/api_clients
 verbose "...Done"
@@ -337,9 +344,9 @@ 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}
 echo "${web_user} ALL = (root) NOPASSWD: /sbin/start    airtime-media-monitor, \
-                                         /sbin/stop     airtime-media-monitor, \
-                                         /sbin/restart  airtime-media-monitor, \
-                                         /sbin/status   airtime-media-monitor" > /etc/sudoers.d/airtime-media-monitor_${web_user}
+/sbin/stop airtime-media-monitor, \
+/sbin/restart 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
@@ -349,21 +356,21 @@ 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, \
-                                         /sbin/stop     airtime-playout, \
-                                         /sbin/restart  airtime-playout, \
-                                         /sbin/status   airtime-playout" > /etc/sudoers.d/airtime-playout_${web_user}
+echo "${web_user} ALL = (root) NOPASSWD: /sbin/start airtime-playout, \
+/sbin/stop airtime-playout, \
+/sbin/restart airtime-playout, \
+/sbin/status airtime-playout" > /etc/sudoers.d/airtime-playout_${web_user}
 
 ln -sf /usr/bin/liquidsoap /usr/bin/airtime-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}
+/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-*
+chmod 755 /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/media-monitor/airtime-media-monitor-init-d b/python_apps/media-monitor/airtime-media-monitor-init-d
index f1fb319de..b5636e70b 100755
--- a/python_apps/media-monitor/airtime-media-monitor-init-d
+++ b/python_apps/media-monitor/airtime-media-monitor-init-d
@@ -14,7 +14,7 @@ GROUPID=WEB_USER
 NAME=Airtime\ Media\ Monitor
 
 DAEMON=/usr/lib/airtime/media-monitor/airtime-media-monitor
-PIDFILE=/var/run/airtime-media-monitor.pid
+PIDFILE=/var/run/airtime/airtime-media-monitor.pid
 
 start () {
         start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID \
diff --git a/python_apps/pypo/airtime-liquidsoap-init-d b/python_apps/pypo/airtime-liquidsoap-init-d
index a7d85a745..31144cc92 100755
--- a/python_apps/pypo/airtime-liquidsoap-init-d
+++ b/python_apps/pypo/airtime-liquidsoap-init-d
@@ -14,7 +14,7 @@ GROUPID=WEB_USER
 NAME="Liquidsoap Playout Engine"
 
 DAEMON=/usr/lib/airtime/pypo/bin/airtime-liquidsoap
-PIDFILE=/var/run/airtime-liquidsoap.pid
+PIDFILE=/var/run/airtime/airtime-liquidsoap.pid
 EXEC='/usr/bin/airtime-liquidsoap'
 
 start () {
diff --git a/python_apps/pypo/airtime-playout-init-d b/python_apps/pypo/airtime-playout-init-d
index cf3cbfd91..07dfc4476 100755
--- a/python_apps/pypo/airtime-playout-init-d
+++ b/python_apps/pypo/airtime-playout-init-d
@@ -13,7 +13,7 @@ USERID=WEB_USER
 NAME="Airtime Scheduler"
 
 DAEMON=/usr/lib/airtime/pypo/bin/airtime-playout
-PIDFILE=/var/run/airtime-playout.pid
+PIDFILE=/var/run/airtime/airtime-playout.pid
 
 start () {
         mkdir -p /var/log/airtime/pypo