[gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-nsca/files: nsca.conf nsca.init

[Diego Petteno (flameeyes)]

flameeyes    12/08/23 21:23:31

  Modified:             nsca.init
  Added:                nsca.conf
  Log:
  Revision bump: add a minimal USE flag to only build send_nsca instead of the daemon; add a dependency on either nagios or icinga for the non-minimal install; install a configuration file with icinga defaults (user/group and paths); allow changing the configuration file for the init script (install conf.d file for that) and depend properly on icinga/nagios.
  
  (Portage version: 2.2.0_alpha121/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  net-analyzer/nagios-nsca/files/nsca.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/files/nsca.init?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/files/nsca.init?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/files/nsca.init?r1=1.2&r2=1.3

Index: nsca.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/files/nsca.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsca.init	21 Aug 2012 17:30:54 -0000	1.2
+++ nsca.init	23 Aug 2012 21:23:31 -0000	1.3
@@ -1,26 +1,35 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/files/nsca.init,v 1.2 2012/08/21 17:30:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/files/nsca.init,v 1.3 2012/08/23 21:23:31 flameeyes Exp $
 
-get_pidfile() {
-    sed -n -e 's:^[ \t]*pid_file=\([^#]\+\).*:\1:p' \
-	/etc/nagios/nsca.cfg
+: ${CFGFILE:=/etc/nagios/nsca.cfg}
+
+get_config() {
+    [ -f ${CFGFILE} ] || return 1
+
+    sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' \
+	${CFGFILE}
 }
 
 extra_started_commands="reload"
 
 command=/usr/libexec/${SVCNAME}
-command_args="-c /etc/nagios/nsca.cfg --daemon"
-pidfile=$(get_pidfile)
+command_args="-c ${CFGFILE} --daemon"
+pidfile=$(get_config pid_file)
 
 depend() {
+    config ${CFGFILE}
+
     need net
-    use icinga nagios
+    case $(get_config nsca_user) in
+	icinga) need icinga ;;
+	nagios) need nagios ;;
+    esac
 }
 
 reload() {
     ebegin "Reloading nsca"
-    kill -HUP `cat $(get_pidfile)`
+    kill -HUP `cat $(get_config pid_file)`
     eend $? "Failed to reload nsca"
 }



1.1                  net-analyzer/nagios-nsca/files/nsca.conf

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/files/nsca.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/files/nsca.conf?rev=1.1&content-type=text/plain

Index: nsca.conf
===================================================================
# Choose the configuration file to use; the pre-defined configurations
# for Nagios and Icinga are available in their respective directories:
#  /etc/nagios/nsca.cfg
#  /etc/icinga/nsca.cfg
CFGFILE=/etc/nagios/nsca.cfg