From: Matt Thode Date: Sun, 8 Jan 2012 18:41:15 +0000 (+0000) Subject: fixed init, reload was not working. readded checkconfig function to fix X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=519ef8ba3813a1b7a96bafb1c473d038339b4f82;p=gentoo.git fixed init, reload was not working. readded checkconfig function to fix Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- 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 files/icinga-init.d-2: + fixed the reload function and readded the checkconfig function to the init + script 29 Dec 2011; mthode +icinga-1.6.1-r1.ebuild: readding r1.... diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest index bbd5853d0770..4bd8e6c4c174 100644 --- a/net-analyzer/icinga/Manifest +++ b/net-analyzer/icinga/Manifest @@ -5,29 +5,29 @@ AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7 AUX icinga-apache.conf 591 RMD160 e2286c2a17869c1dc7e5229ad46ae20e8f9d65a1 SHA1 a52d44d21ea28488838de50a2151b29a341203dd SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db AUX icinga-init.d 1207 RMD160 fe0f17d9247da24208281077b6cb46089dc9f22f SHA1 58c8fc60da8f4fb5a7d29a8be83948e11a8719e4 SHA256 d9014a1ce527282e5a404e602b3f08e0a4b842e02bd2fcdd8fffb8e67922557d -AUX icinga-init.d-2 999 RMD160 c217fe01d49a4e29b22fd1c2a9125918fd1ccc69 SHA1 f791fa9a1b70b4593afd84adaafeb6bcffcb7931 SHA256 f94dc546ca1a45f67b3d79aff39f937a5fb0b6ca19de3110f30e09d7a0c6bf08 +AUX icinga-init.d-2 1267 RMD160 843973fac0562c75c92362aa6f313ba617abe2fd SHA1 af23cfd4f3a911c648aa125bafb873707d4b34b8 SHA256 cfef566114fcfbd53dc3f43f7352b934d33c7a0d62f554dfb0eae352f6e09d01 AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 0d74cc2936327121f07b61fb1a348ce66035bfbb SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 AUX ido2db-init.d 990 RMD160 4eef38e9266754653a7cc5c2f00e294a060941bd SHA1 fc444a4845bf8c6a5c0378f397583b11ce4bd5f1 SHA256 b59b82578929c54ecf8555ffd28c1a13f4b7e856240f8b1c77c9ceca06839252 DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b EBUILD icinga-1.6.1-r1.ebuild 6966 RMD160 dc74f5db5ba287a878c89bdd409ffbce7bd10bf5 SHA1 4e0d1d97832e554d8db12fbd9d72996947fd3db1 SHA256 f73436e501d4984d61fe3e2f1ab0f338ab914baa91377f766b313806ab2de6b5 EBUILD icinga-1.6.1-r2.ebuild 6967 RMD160 de56d01c620946ed79e3a18c133f83ce7b522692 SHA1 9d303bc3cfa40df087cc71855e930e56e228332c SHA256 1e95471d646f458f67204e740b25b4bb2ade9eb5352b0cebeb3649e6bdd39eb5 -MISC ChangeLog 2224 RMD160 04dff20c39ef95fe2263efcebcd35fbe10b883eb SHA1 d3e3de4ab18c6c9cdbe3a6365d3a555cde55867e SHA256 edda1da3da14f29e4ec428f1a9e046cbda9538ccb15b2fe5ed32eca772e0967c +MISC ChangeLog 2376 RMD160 a318a814e70fec457c703cc608c3009a277d561f SHA1 ae2c2333d8aa018295454449400498699cbd1e82 SHA256 e7a264dce0ba8d585c1fed55fa9805913d02acb30bfd7e643e36ccb3a63bdaae MISC metadata.xml 556 RMD160 c1d1f8af0e1c04b4d8f6dd56778b668a78a6ea71 SHA1 792f55c63007e3618d0ce38c636e6758d0fca123 SHA256 25b529090c12f48532b45242e759296861c4a9e5c1111648f382f6a5326075ab -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJO/I5cAAoJECRx6z5ArFrDRacP/jGzufJD5c4geqg7jdC56nw8 -ivadC1MKX2SI9YHulYhFzFfRjtsmIF3u8ByPJmIVQNCJOkooIo7/Cv7FmxN4V2Rk -eUAny8iMooIStlLLNfu878lIeTX+Ml9s10Hq+uVS8mVQ/QrljUS9hEMEe9wai9PZ -KpUnAFjIMwJN5VnACqOgv2hLoZjO0bzzI/ayqNye8g6WwTG+ODngExnLWth0BT8h -DDj01EYqy4nK1gfEYxV13nrcQNSCS02jZxwiyTvieOZ3WvoM+Pk+JclOglrvux8w -OSYou9Lv5tlm5A6bPrEc6zIkrTwL0Bw47brV0YQVK7CsVA486iaKa0A2ng5h9wGW -tyVh5ZQ5zIIRM9sKeaOgKeBQZH6Dkq17Twzt40jb0cbFE0ekl3hw8Xl+AvhUWl3M -w1cfwzel+oa1kXPdBjkSXBzjAFG2ZCsP5z1fFkaAIFtKyx75V468VV8JwWK2OKlb -0K4yfqlMVn6J8UQj+OGE7eaceutfSMhgza0EIHB42oZsFvZuqqe9MOIZ/73zdT81 -hMUb6n1itpGY2AccbrjIsJOwEAx+3cIDooa28PdJSvV6HHdGWwl8MPEBWi/ErXAP -Gd1hC3C1ayuVjlc+to75lnjlYXsR1sVtxxnlYoRDOVue3w7ecLV/xsc0jU+QMXqW -xDzR55wgzVpds2Lb9szd -=cCTO +iQIcBAEBAgAGBQJPCeNaAAoJECRx6z5ArFrDRh0QANvstzW/NZltLJ83+ep6JJwb +EgViyIcrg23RAF0KIvurRFKTRXC6ZwrCLF6hCuhl4WgDZYctwK5W3ZKwJhtFX2ki +M3PbKAUdxZScfZ1TB4FEStN93xvmDqAdMSU/K82b0uxxfHA1BeFwYnT2AfGHp7AA +PNEA7Exy6Lwm99eIWydq4UXSXH5GsAi4j6FgrS6y6aaLM13zQlr4kyo/qzpFKNzu +gaxTajN2Yp0xh4OpgpasCnAtL/mZMvTPMS9a503EfP8RNgAXTD4LwM4kVEaLTzF8 +54M9yu+8+dq5YalnNM74+jfagMfzZIeCjFGSLlOdrISTc+zkhIuUODLqdT5UV/wj +mL/5Fn0rC+UMh4z6hNr5IdjfmV79dZt6N5WxsQ4qT7/tvnyKEQFw0PlrAXqj+oZC +VH1PwM/MFlU9FBuVCEEpC/1yo9AvCpCrSy10MJMjAPSkYp/Am8hHD+SMUQHNb+db +pEW3lEb4erDkSNZHohccpWQMMQ4BvOILrDNnF3BdwfCOdOjgM8rtqNukO0WKxRX7 +vmGqUY2HSpEaafZVBADJWeT2DamHg/CY0EvaiA0OMndv9ooybwJn6QxgYSnGSLc7 +v/kVgE5zIE7frgc1HN17BFKCZmcBp9/RbB0W/fRwii47bgPMvq+i267LahjPwuNc +dVTXxuORAXMrBFNchLUC +=Kv2C -----END PGP SIGNATURE----- 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