Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x

install_minimal/airtime-install

@@ -143,6 +143,11 @@ fi
 #We don't want any of our python services running if we are doing an upgrade/reinstall.
 #They will be automatically restarted later on.
 echo "* Temporarily stopping any previous running services"
+set +e
+monit unmonitor airtime-media-monitor >/dev/null 2>&1
+monit unmonitor airtime-liquidsoap >/dev/null 2>&1
+monit unmonitor airtime-playout >/dev/null 2>&1
+set -e
 if [ -e /etc/init.d/airtime-media-monitor ]; then
     invoke-rc.d airtime-media-monitor stop > /dev/null 2>&1
 fi

install_minimal/include/airtime-uninitialize.sh

@@ -21,13 +21,9 @@ monit unmonitor airtime-liquidsoap >/dev/null 2>&1
 monit unmonitor airtime-playout >/dev/null 2>&1
 set -e
 
-#virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
-#. ${virtualenv_bin}activate
-
 #uninitialize Airtime services
 python $AIRTIMEROOT/python_apps/pypo/install/pypo-uninitialize.py
 python $AIRTIMEROOT/python_apps/media-monitor/install/media-monitor-uninitialize.py
-#python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-uninitialize.py
 
 if [ "$purge" = "t" ]; then
 #call Airtime uninstall script

python_apps/pypo/airtime-liquidsoap-init-d

@@ -15,6 +15,7 @@ NAME="Liquidsoap Playout Engine"
 
 DAEMON=/usr/lib/airtime/pypo/bin/airtime-liquidsoap
 PIDFILE=/var/run/airtime-liquidsoap.pid
+EXEC='/usr/bin/airtime-liquidsoap'
 
 start () {
         chown pypo:pypo /var/log/airtime/pypo
@@ -24,8 +25,10 @@ start () {
         touch $PIDFILE
         chown pypo:pypo $PIDFILE 
 
+        #start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
+            #--pidfile $PIDFILE --nicelevel -15 --startas $DAEMON
         start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
-            --pidfile $PIDFILE --nicelevel -15 --startas $DAEMON
+             --nicelevel -15 --startas $DAEMON --exec $EXEC
 }
 
 stop () {
@@ -33,9 +36,11 @@ stop () {
         timeout -s9 10s /usr/lib/airtime/airtime_virtualenv/bin/python \
             /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py        
         # Send TERM after 5 seconds, wait at most 30 seconds.
-        start-stop-daemon --stop --oknodo --retry=TERM/10/KILL/5 --quiet --pidfile $PIDFILE
+        #start-stop-daemon --stop --oknodo --retry=TERM/10/KILL/5 --quiet --pidfile $PIDFILE
+        start-stop-daemon --stop --oknodo --retry=TERM/10/KILL/5 --quiet --exec $EXEC
+
         rm -f $PIDFILE
-        sleep 3
+        sleep 2
 }
 
 start_with_monit () {

python_apps/pypo/monit-airtime-liquidsoap.cfg

@@ -3,8 +3,7 @@
 
  set httpd port 2812
 
- check process airtime-liquidsoap
-    with pidfile "/var/run/airtime-liquidsoap.pid"
+ check process airtime-liquidsoap matching "airtime-liquidsoap.*airtime.*ls_script"
     start program = "/etc/init.d/airtime-liquidsoap start" with timeout 30 seconds
     stop program = "/etc/init.d/airtime-liquidsoap stop"