From 92ad5bde6d64ab0459276322da9c3e9e462f9f79 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Wed, 17 Jun 2015 14:49:12 -0400
Subject: [PATCH] Add fields to airtime.example.conf for compatibility, remove
 /etc/init scripts to prevent duplicate processes on startup

---
 airtime_mvc/build/airtime.example.conf | 34 +++++++++++++++++++++++---
 install                                | 10 ++++----
 python_apps/media-monitor/setup.py     |  2 +-
 python_apps/pypo/setup.py              |  4 +--
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/airtime_mvc/build/airtime.example.conf b/airtime_mvc/build/airtime.example.conf
index 98c5c7887..f94cbb4d0 100644
--- a/airtime_mvc/build/airtime.example.conf
+++ b/airtime_mvc/build/airtime.example.conf
@@ -4,8 +4,8 @@
 #
 # This is an example configuration for Airtime. If you just want to
 # get started with a basic Airtime setup, or don't know if you should
-# be reconfiguring any of the following values, just rename this file
-# to 'airtime.conf'.
+# be reconfiguring any of the following values, just move this file
+# to '/etc/airtime/' and rename it 'airtime.conf'.
 #
 # ----------------------------------------------------------------------
 
@@ -37,6 +37,11 @@
 #                    engine (pypo) should cache scheduled media files.
 #                    The default is 1.
 #
+# airtime_dir:       Only used in saas, needed for compatibility.
+#
+# station_id:        The Airtime station name.
+#                    Only used in saas, needed for compatibility.
+#
 [general]
 api_key =
 web_server_user = www-data
@@ -44,6 +49,8 @@ base_url = localhost
 base_port = 80
 base_dir = /
 cache_ahead_hours = 1
+airtime_dir =
+station_id =
 #
 # ----------------------------------------------------------------------
 
@@ -107,6 +114,23 @@ vhost = /airtime
 # ----------------------------------------------------------------------
 
 
+# ----------------------------------------------------------------------
+#                               M O N I T
+# ----------------------------------------------------------------------
+#
+# These settings are only for backwards compatibility.
+#
+# user:     The username for the monit user.
+#
+# password: The password for the monit user.
+#
+[monit]
+user =
+password =
+#
+# ----------------------------------------------------------------------
+
+
 # ----------------------------------------------------------------------
 #                         M E D I A   M O N I T O R
 # ----------------------------------------------------------------------
@@ -132,10 +156,12 @@ vhost = /airtime
 #                          The default is 0.1
 #
 # logpath:                 The media monitor log file path
-#                          The default is '/var/log/airtime/media-monitor/media-monitor.log'
+#                          The default is
+#                           '/var/log/airtime/media-monitor/media-monitor.log'
 #
 # index_path:              The media monitor index path
-#                          The default is '/var/tmp/airtime/media-monitor/last_index'
+#                          The default is
+#                           '/var/tmp/airtime/media-monitor/last_index'
 #
 [media-monitor]
 check_filesystem_events = 5
diff --git a/install b/install
index 86d184f2c..0cae36632 100755
--- a/install
+++ b/install
@@ -467,11 +467,11 @@ verbose "\n * Installing pypo..."
 loudCmd "python ${AIRTIMEROOT}/python_apps/pypo/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"
diff --git a/python_apps/media-monitor/setup.py b/python_apps/media-monitor/setup.py
index 3031b14aa..910a9c325 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', []),
diff --git a/python_apps/pypo/setup.py b/python_apps/pypo/setup.py
index 76011e72d..3f83fb109 100644
--- a/python_apps/pypo/setup.py
+++ b/python_apps/pypo/setup.py
@@ -18,8 +18,8 @@ else:
             pypo_files.append(os.path.join(root, filename))
         
     data_files = [
-                  ('/etc/init', ['install/upstart/airtime-playout.conf.template']),
-                  ('/etc/init', ['install/upstart/airtime-liquidsoap.conf.template']),
+                  # ('/etc/init', ['install/upstart/airtime-playout.conf.template']),
+                  # ('/etc/init', ['install/upstart/airtime-liquidsoap.conf.template']),
                   ('/etc/init.d', ['install/sysvinit/airtime-playout']),
                   ('/etc/init.d', ['install/sysvinit/airtime-liquidsoap']),
                   ('/var/log/airtime/pypo', []),