| 1 |
polynomial-c 11/12/30 15:34:02 |
| 2 |
|
| 3 |
Modified: nagios3 |
| 4 |
Log: |
| 5 |
Rewrote init script. Fixed deprecated s-s-d options. Let reload function use s-s-d as well (bug #392929) |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-analyzer/nagios-core/files/nagios3 |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/nagios3?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/nagios3?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/nagios3?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: nagios3 |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios3,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- nagios3 27 Apr 2008 18:41:25 -0000 1.1 |
| 23 |
+++ nagios3 30 Dec 2011 15:34:02 -0000 1.2 |
| 24 |
@@ -1,9 +1,18 @@ |
| 25 |
#!/sbin/runscript |
| 26 |
-# Copyright 1999-2004 Gentoo Foundation |
| 27 |
+# Copyright 1999-2011 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios3,v 1.1 2008/04/27 18:41:25 dertobi123 Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios3,v 1.2 2011/12/30 15:34:02 polynomial-c Exp $ |
| 31 |
|
| 32 |
-opts="${opts} reload checkconfig" |
| 33 |
+extra_commands="checkconfig" |
| 34 |
+extra_started_commands="reload" |
| 35 |
+ |
| 36 |
+nagios_config="/etc/nagios/nagios.cfg" |
| 37 |
+nagios_cmdfile="/var/nagios/rw/nagios.cmd" |
| 38 |
+ |
| 39 |
+command="/usr/sbin/nagios" |
| 40 |
+command_args="-d ${nagios_config}" |
| 41 |
+pidfile="/var/nagios/nagios.lock" |
| 42 |
+start_stop_daemon_args="-e HOME=/var/nagios/home" |
| 43 |
|
| 44 |
depend() { |
| 45 |
need net |
| 46 |
@@ -15,43 +24,30 @@ |
| 47 |
{ |
| 48 |
checkconfig || return 1 |
| 49 |
ebegin "Reloading configuration" |
| 50 |
- killall -HUP nagios &>/dev/null |
| 51 |
+ start-stop-daemon --signal HUP --pidfile ${pidfile} |
| 52 |
eend $? |
| 53 |
} |
| 54 |
|
| 55 |
checkconfig() { |
| 56 |
+ ebegin "Verifiyng config files" |
| 57 |
+ |
| 58 |
# Silent Check |
| 59 |
- /usr/sbin/nagios -v /etc/nagios/nagios.cfg &>/dev/null && return 0 |
| 60 |
+ /usr/sbin/nagios -v ${nagios_config} &>/dev/null && return 0 |
| 61 |
|
| 62 |
# Now we know there's problem - run again and display errors |
| 63 |
- /usr/sbin/nagios -v /etc/nagios/nagios.cfg |
| 64 |
+ /usr/sbin/nagios -v ${nagios_config} |
| 65 |
eend $? "Configuration Error. Please fix your configfile" |
| 66 |
} |
| 67 |
|
| 68 |
-start() { |
| 69 |
+start_pre() { |
| 70 |
checkconfig || return 1 |
| 71 |
- ebegin "Starting nagios" |
| 72 |
+ |
| 73 |
touch /var/nagios/nagios.log /var/nagios/status.sav |
| 74 |
chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav |
| 75 |
- rm -f /var/nagios/rw/nagios.cmd |
| 76 |
- start-stop-daemon --quiet --start --startas /usr/sbin/nagios \ |
| 77 |
- -e HOME="/var/nagios/home" --pidfile /var/nagios/nagios.lock \ |
| 78 |
- -- -d /etc/nagios/nagios.cfg |
| 79 |
- eend $? |
| 80 |
+ rm -f ${nagios_cmdfile} |
| 81 |
} |
| 82 |
|
| 83 |
-stop() { |
| 84 |
- ebegin "Stopping nagios" |
| 85 |
- start-stop-daemon --quiet --stop --pidfile /var/nagios/nagios.lock |
| 86 |
- rm -f /var/nagios/status.log /var/nagios/nagios.tmp /var/nagios/nagios.lock /var/nagios/rw/nagios.cmd |
| 87 |
- eend $? |
| 88 |
+stop_post() { |
| 89 |
+ rm -f /var/nagios/status.log /var/nagios/nagios.tmp ${pidfile} \ |
| 90 |
+ ${nagios_cmdfile} |
| 91 |
} |
| 92 |
- |
| 93 |
-svc_restart() { |
| 94 |
- checkconfig || return 1 |
| 95 |
- ebegin "Restarting nagios" |
| 96 |
- svc_stop |
| 97 |
- svc_start |
| 98 |
- eend $? |
| 99 |
-} |
| 100 |
- |
Archives