Title: [opsview] [13174] Made /etc/init.d/opsview handle Opsview specific commands.
- Revision
- 13174
- Author
- pknight
- Date
- 2013-08-07 16:32:32 +0100 (Wed, 07 Aug 2013)
Log Message
Made /etc/init.d/opsview handle Opsview specific commands.
Opsview now starts automatically when MySQL starts.
Modified Paths
Added Paths
Removed Paths
Modified: trunk/opsview-core/bin/opsview_daemon
===================================================================
--- trunk/opsview-core/bin/opsview_daemon 2013-08-07 12:26:05 UTC (rev 13173)
+++ trunk/opsview-core/bin/opsview_daemon 2013-08-07 15:32:32 UTC (rev 13174)
@@ -17,5 +17,5 @@
/usr/local/nagios/bin/rc.opsview start &
while true; do
- sleep 60
+ sleep 100d
done
Modified: trunk/opsview-core/debian/postinst
===================================================================
--- trunk/opsview-core/debian/postinst 2013-08-07 12:26:05 UTC (rev 13173)
+++ trunk/opsview-core/debian/postinst 2013-08-07 15:32:32 UTC (rev 13174)
@@ -139,8 +139,9 @@
rm -f /etc/init.d/opsview
update-rc.d opsview remove
# Create Upstart files.
- ln -s /lib/init/upstart-job /etc/init.d/opsview
- cp /usr/local/nagios/installer/opsview.conf /etc/init/opsview.conf
+ cp /usr/local/nagios/installer/opsview-upstart-init.d /etc/init.d/opsview
+ ln -s /lib/init/upstart-job /etc/init.d/opsview-upstart
+ cp /usr/local/nagios/installer/opsview-upstart.conf /etc/init/opsview-upstart.conf
fi
return 0
Added: trunk/opsview-core/installer/opsview-upstart-init.d
===================================================================
--- trunk/opsview-core/installer/opsview-upstart-init.d (rev 0)
+++ trunk/opsview-core/installer/opsview-upstart-init.d 2013-08-07 15:32:32 UTC (rev 13174)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+case "$1" in
+ stop|start|restart|status|reload|force-reload)
+ /etc/init.d/opsview-upstart "$@"
+ ;;
+ *)
+ /usr/local/nagios/bin/rc.opsview "$@"
+ ;;
+esac
Copied: trunk/opsview-core/installer/opsview-upstart.conf (from rev 13169, trunk/opsview-core/installer/opsview.conf)
===================================================================
--- trunk/opsview-core/installer/opsview-upstart.conf (rev 0)
+++ trunk/opsview-core/installer/opsview-upstart.conf 2013-08-07 15:32:32 UTC (rev 13174)
@@ -0,0 +1,22 @@
+# Opsview service for Ubuntu's Upstart
+
+description "Opsview server"
+author "Opsview Ltd."
+
+start on runlevel [2345] or started JOB=mysql
+stop on starting rc RUNLEVEL=[016] or stopping JOB=mysql
+
+expect fork
+kill timeout 300
+respawn limit 2 5
+
+pre-start script
+ if [ ! -r /var/run/mysqld/mysqld.pid ]; then
+ echo "MySQL needs to be running" >> /var/log/opsview/opsview_daemon
+ exit 1
+ fi
+end script
+
+script
+ /usr/local/nagios/bin/opsview_daemon
+end script
Deleted: trunk/opsview-core/installer/opsview.conf
===================================================================
--- trunk/opsview-core/installer/opsview.conf 2013-08-07 12:26:05 UTC (rev 13173)
+++ trunk/opsview-core/installer/opsview.conf 2013-08-07 15:32:32 UTC (rev 13174)
@@ -1,22 +0,0 @@
-# Opsview service for Ubuntu's Upstart
-
-description "Opsview Server"
-author "The Dark Knight"
-
-start on runlevel [2345]
-stop on starting rc RUNLEVEL=[016] or stopping JOB=mysql
-
-expect fork
-kill timeout 300
-respawn limit 2 5
-
-pre-start script
- if [ ! -r /var/run/mysqld/mysqld.pid ]; then
- echo "MySQL needs to be running" >> /var/log/opsview/opsview_daemon
- exit 1
- fi
-end script
-
-script
- /usr/local/nagios/bin/opsview_daemon
-end script
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
