diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2012-01-08 18:41:15 +0000 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2012-01-08 18:41:15 +0000 |
| commit | efb928ac1da2257fb966de469360f569a6fc1ab0 (patch) | |
| tree | 91fe073aa40ff484be6d71668b0498536ace417b /net-analyzer | |
| parent | Add live ebuild (diff) | |
| download | gentoo-2-efb928ac1da2257fb966de469360f569a6fc1ab0.tar.gz gentoo-2-efb928ac1da2257fb966de469360f569a6fc1ab0.tar.bz2 gentoo-2-efb928ac1da2257fb966de469360f569a6fc1ab0.zip | |
fixed init, reload was not working. readded checkconfig function to fix
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/icinga/ChangeLog | 8 | ||||
| -rwxr-xr-x | net-analyzer/icinga/files/icinga-init.d-2 | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog index 66baf032cd62..02753e896cb1 100644 --- a/net-analyzer/icinga/ChangeLog +++ b/net-analyzer/icinga/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/icinga -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.10 2011/12/29 15:59:11 prometheanfire Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.11 2012/01/08 18:41:15 prometheanfire Exp $ + + 08 Jan 2012; mthode <mthode@gentoo.org> files/icinga-init.d-2: + fixed the reload function and readded the checkconfig function to the init + script 29 Dec 2011; mthode <mthode@gentoo.org> +icinga-1.6.1-r1.ebuild: readding r1.... diff --git a/net-analyzer/icinga/files/icinga-init.d-2 b/net-analyzer/icinga/files/icinga-init.d-2 index 8f05cc7dcdce..683e52c4c4e5 100755 --- a/net-analyzer/icinga/files/icinga-init.d-2 +++ b/net-analyzer/icinga/files/icinga-init.d-2 @@ -8,6 +8,14 @@ depend() { after mysql postgresql ido2db } +checkconfig() { + # Silent Check + /usr/sbin/icinga -v /etc/icinga/icinga.cfg &>/dev/null && return 0 + # Now we know there's problem - run again and display errors + /usr/sbin/icinga -v /etc/icinga/icinga.cfg + eend $? "Configuration Error. Please fix your configfile" +} + reload() { checkconfig || return 1 |