From 51a95fb989051f9b8b4a601d621046dfdfaee7bc Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Tue, 16 Dec 2014 20:12:20 -0500
Subject: [PATCH] More work on monitless installer
---
python_apps/media-monitor/monit-airtime-media-monitor.cfg | 2 +-
python_apps/monit/monit-airtime-rabbitmq-server.cfg | 2 +-
.../pypo/liquidsoap_scripts/airtime-liquidsoap.logrotate | 2 +-
python_apps/pypo/liquidsoap_scripts/ls_script.liq | 2 +-
python_apps/pypo/monit-airtime-playout.cfg | 2 +-
python_apps/pypo/monit-pre530-airtime-liquidsoap.cfg | 2 +-
utils/rabbitmq-update-pid.sh | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/python_apps/media-monitor/monit-airtime-media-monitor.cfg b/python_apps/media-monitor/monit-airtime-media-monitor.cfg
index 7001a3f5a..51a632f21 100644
--- a/python_apps/media-monitor/monit-airtime-media-monitor.cfg
+++ b/python_apps/media-monitor/monit-airtime-media-monitor.cfg
@@ -4,6 +4,6 @@
set httpd port 2812
check process airtime-media-monitor
- with pidfile "/var/run/airtime-media-monitor.pid"
+ with pidfile "/var/run/airtime/airtime-media-monitor.pid"
start program = "/etc/init.d/airtime-media-monitor start" with timeout 10 seconds
stop program = "/etc/init.d/airtime-media-monitor stop"
diff --git a/python_apps/monit/monit-airtime-rabbitmq-server.cfg b/python_apps/monit/monit-airtime-rabbitmq-server.cfg
index dac2463c8..2ee2455a5 100644
--- a/python_apps/monit/monit-airtime-rabbitmq-server.cfg
+++ b/python_apps/monit/monit-airtime-rabbitmq-server.cfg
@@ -2,6 +2,6 @@
set logfile /var/log/monit.log
check process rabbitmq-server
- with pidfile "/var/run/rabbitmq.pid"
+ with pidfile "/var/run/airtime/rabbitmq.pid"
start program = "/bin/bash -c '/etc/init.d/rabbitmq-server start; /usr/lib/airtime/utils/rabbitmq-update-pid.sh'"
stop program = "/etc/init.d/rabbitmq-server stop"
diff --git a/python_apps/pypo/liquidsoap_scripts/airtime-liquidsoap.logrotate b/python_apps/pypo/liquidsoap_scripts/airtime-liquidsoap.logrotate
index 9e0efed20..c08f5491c 100644
--- a/python_apps/pypo/liquidsoap_scripts/airtime-liquidsoap.logrotate
+++ b/python_apps/pypo/liquidsoap_scripts/airtime-liquidsoap.logrotate
@@ -6,6 +6,6 @@
notifempty
sharedscripts
postrotate
- start-stop-daemon --stop --signal USR1 --quiet --pidfile /var/run/airtime-liquidsoap.pid
+ start-stop-daemon --stop --signal USR1 --quiet --pidfile /var/run/airtime/airtime-liquidsoap.pid
endscript
}
diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
index 86770458b..49c84b62d 100644
--- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
@@ -3,7 +3,7 @@
set("log.file.path", log_file)
set("server.telnet", true)
set("server.telnet.port", 1234)
-set("init.daemon.pidfile.path", "/var/run/airtime-liquidsoap.pid")
+set("init.daemon.pidfile.path", "/var/run/airtime/airtime-liquidsoap.pid")
%include "library/pervasives.liq"
diff --git a/python_apps/pypo/monit-airtime-playout.cfg b/python_apps/pypo/monit-airtime-playout.cfg
index 453f4efec..9f0642bab 100644
--- a/python_apps/pypo/monit-airtime-playout.cfg
+++ b/python_apps/pypo/monit-airtime-playout.cfg
@@ -4,6 +4,6 @@
set httpd port 2812
check process airtime-playout
- with pidfile "/var/run/airtime-playout.pid"
+ with pidfile "/var/run/airtime/airtime-playout.pid"
start program = "/etc/init.d/airtime-playout start" with timeout 5 seconds
stop program = "/etc/init.d/airtime-playout stop"
diff --git a/python_apps/pypo/monit-pre530-airtime-liquidsoap.cfg b/python_apps/pypo/monit-pre530-airtime-liquidsoap.cfg
index 4b2265f18..0cf179831 100644
--- a/python_apps/pypo/monit-pre530-airtime-liquidsoap.cfg
+++ b/python_apps/pypo/monit-pre530-airtime-liquidsoap.cfg
@@ -3,6 +3,6 @@
set httpd port 2812
- check process airtime-liquidsoap with pidfile "/var/run/airtime-liquidsoap.pid"
+ check process airtime-liquidsoap with pidfile "/var/run/airtime/airtime-liquidsoap.pid"
start program = "/etc/init.d/airtime-liquidsoap start" with timeout 5 seconds
stop program = "/etc/init.d/airtime-liquidsoap stop"
diff --git a/utils/rabbitmq-update-pid.sh b/utils/rabbitmq-update-pid.sh
index a756c0d1c..435939196 100755
--- a/utils/rabbitmq-update-pid.sh
+++ b/utils/rabbitmq-update-pid.sh
@@ -12,4 +12,4 @@ else
fi
echo "RabbitMQ PID: $rabbitmqpid"
-echo "$rabbitmqpid" > /var/run/rabbitmq.pid
+echo "$rabbitmqpid" > /var/run/airtime/rabbitmq.pid