Title: [opsview] [13162] Moved upstart section to configure.
- Revision
- 13162
- Author
- pknight
- Date
- 2013-08-07 09:49:45 +0100 (Wed, 07 Aug 2013)
Log Message
Moved upstart section to configure. The install section didn't get run.
Changed permission of opsview.conf.
Modified Paths
Modified: trunk/opsview-core/debian/postinst
===================================================================
--- trunk/opsview-core/debian/postinst 2013-08-07 08:43:51 UTC (rev 13161)
+++ trunk/opsview-core/debian/postinst 2013-08-07 08:49:45 UTC (rev 13162)
@@ -132,32 +132,24 @@
echo "Running common postinstall tasks"
test -f /usr/local/nagios/installer/postinstall_root && /usr/local/nagios/installer/postinstall_root 3>/dev/null
test -f /usr/local/nagios/installer/postinstall && su - nagios -c '/usr/local/nagios/installer/postinstall' 3>/dev/null
+
+ echo "Configuring Upstart"
+ # Remove current startup and shutdown scripts from init.
+ 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
+
return 0
}
-upstart() {
- # Remove current startup and shutdown scripts from init.
- rm /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
-}
-
case "$1" in
install)
- # Use Ubuntu's Upstart.
- if lsb_release -i | grep -q Ubuntu; then
- upstart
- fi
- ;;
+ ;;
upgrade)
- # Change from System V to Ubuntu's Upstart.
- if lsb_release -i | grep -q Ubuntu; then
- upstart
- fi
- ;;
+ ;;
# We now create databases altogether. It used to be checked individually, but
# that is different from all the instructions we have for other platforms
Modified: trunk/opsview-core/filelist
===================================================================
--- trunk/opsview-core/filelist 2013-08-07 08:43:51 UTC (rev 13161)
+++ trunk/opsview-core/filelist 2013-08-07 08:49:45 UTC (rev 13162)
@@ -655,7 +655,7 @@
f nagios:nagios 0555 /usr/local/nagios/installer/migrate_rrds installer/migrate_rrds
f nagios:nagios 0555 /usr/local/nagios/installer/nagios_3-4_servicechecks.pl installer/nagios_3-4_servicechecks.pl
f nagios:nagios 0555 /usr/local/nagios/installer/opsview_preupgrade_check installer/opsview_preupgrade_check
-f nagios:nagios 0555 /usr/local/nagios/installer/opsview.conf installer/opsview.conf
+f nagios:nagios 0644 /usr/local/nagios/installer/opsview.conf installer/opsview.conf
f root:nagios 0550 /usr/local/nagios/installer/postinstall_root installer/postinstall_root
f nagios:nagios 0550 /usr/local/nagios/installer/postinstall installer/postinstall
f root:nagios 0555 /usr/local/nagios/installer/preremove installer/preremove
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
