From b4599317e9bfdc884dc1cf5df56270fbaf057e4c Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Tue, 30 Jun 2015 12:16:31 -0400
Subject: [PATCH] Run build from installer; add upstart files and templating
back in
---
install | 29 ++++++++++++++++++++---------
python_apps/media-monitor/setup.py | 2 +-
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/install b/install
index 999501670..f10078be1 100755
--- a/install
+++ b/install
@@ -312,6 +312,9 @@ else
checkCommandExists "psql"
fi
+# Run composer (install PHP dependencies) and create a VERSION file
+loudCmd "./build.sh"
+
if [ -f /etc/airtime/airtime.conf ]; then
OLD_CONF=$(grep "[media-monitor]" /etc/airtime/airtime.conf)
@@ -472,19 +475,27 @@ verbose "\n * Installing airtime_analyzer..."
loudCmd "python ${AIRTIMEROOT}/python_apps/airtime_analyzer/setup.py install --install-scripts=/usr/bin"
verbose "...Done"
-#for i in /etc/init/airtime*.template; do
-# chmod 644 $i
-# sed -i "s/WEB_USER/${web_user}/g" $i
-# mv $i ${i%.template}
-#done
+for i in /etc/init/airtime*.template; do
+ chmod 644 $i
+ sed -i "s/WEB_USER/${web_user}/g" $i
+ mv $i ${i%.template}
+done
set +e
loudCmd "initctl reload-configuration"
-loudCmd "systemctl daemon-reload" #systemd hipsters
-loudCmd "update-rc.d airtime-playout defaults" # Start at bootup, on Debian
+
+# airtime-celery only has an init.d startup script
loudCmd "update-rc.d airtime-celery defaults" # Start at bootup, on Debian
-loudCmd "update-rc.d airtime-liquidsoap defaults" # Start at bootup, on Debian
-loudCmd "update-rc.d airtime_analyzer defaults" # Start at bootup, on Debian
+
+# On Ubuntu, we already have the upstart configs, so this is redundant
+# and causes multiple processes to spawn on startup
+if [ "$dist" != "ubuntu" ]; then
+ loudCmd "systemctl daemon-reload" #systemd hipsters
+
+ loudCmd "update-rc.d airtime-playout defaults" # Start at bootup, on Debian
+ loudCmd "update-rc.d airtime-liquidsoap defaults" # Start at bootup, on Debian
+ loudCmd "update-rc.d airtime_analyzer defaults" # Start at bootup, on Debian
+fi
set -e
if [ ! -d /var/log/airtime ]; then
diff --git a/python_apps/media-monitor/setup.py b/python_apps/media-monitor/setup.py
index 910a9c325..3031b14aa 100644
--- a/python_apps/media-monitor/setup.py
+++ b/python_apps/media-monitor/setup.py
@@ -22,7 +22,7 @@ else:
mm2_files.append(os.path.join(root, filename))
data_files = [
- # ('/etc/init', ['install/upstart/airtime-media-monitor.conf.template']),
+ ('/etc/init', ['install/upstart/airtime-media-monitor.conf.template']),
('/etc/init.d', ['install/sysvinit/airtime-media-monitor']),
('/etc/airtime', ['install/media_monitor_logging.cfg']),
('/var/log/airtime/media-monitor', []),