summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode (prometheanfire) <mthode@mthode.org>2011-05-09 18:32:40 +0000
committerMatthew Thode (prometheanfire) <mthode@mthode.org>2011-05-09 18:32:40 +0000
commit7f7005c1d19f8a1531acc829e97d247373b1b76c (patch)
tree617906ca1a74db4300a9193b11067a100d5d4b0d /net-analyzer
parentnet-analyzer/pf_ring-kmod: New Ebuild for bug 366609 (diff)
downloadsunrise-7f7005c1d19f8a1531acc829e97d247373b1b76c.tar.gz
sunrise-7f7005c1d19f8a1531acc829e97d247373b1b76c.tar.bz2
sunrise-7f7005c1d19f8a1531acc829e97d247373b1b76c.zip
net-analyzer/icinga: change to ido2db init, thanks to Wolfgang Schricker
svn path=/sunrise/; revision=12050
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/icinga/ChangeLog4
-rw-r--r--net-analyzer/icinga/Manifest6
-rw-r--r--net-analyzer/icinga/files/ido2db-init.d11
-rw-r--r--net-analyzer/icinga/icinga-1.3.1-r3.ebuild (renamed from net-analyzer/icinga/icinga-1.3.1-r2.ebuild)0
4 files changed, 18 insertions, 3 deletions
diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index d58a6c715..ddabd2af8 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 09 May 2011; mthode <mthode@mthode.org> files/ido2db-init.d,
+ -icinga-1.3.1-r2.ebuild, +icinga-1.3.1-r3.ebuild:
+ change to ido2db init, thanks to Wolfgang Schricker
+
07 Apr 2011; mthode <mthode@mthode.org> icinga-1.3.1-r2.ebuild:
moved the space withing the quotes on the if use plugins content
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 05b70a0b2..aa5f78f29 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -3,8 +3,8 @@ AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 78242
AUX icinga-init.d 1207 RMD160 fe0f17d9247da24208281077b6cb46089dc9f22f SHA1 58c8fc60da8f4fb5a7d29a8be83948e11a8719e4 SHA256 d9014a1ce527282e5a404e602b3f08e0a4b842e02bd2fcdd8fffb8e67922557d
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 539 RMD160 e89e70f67d5accc7ae66b77d9bf61d2e1cc9d647 SHA1 17f9317bd21a5e5dfd41bbb19f50357b80ba9599 SHA256 e5b6a782475cbbde5b49720cdbcbf14958338baca510e78e508902360a479b72
+AUX ido2db-init.d 817 RMD160 6b572b7530fed65a7fb32c1e818ee0754a7e34bc SHA1 9421428f38fdce508f0b9f2a988f9fbd804a068b SHA256 37bedb45671a300ec22b2f8bdfb8865b180d40dbe945d4f9a71ce7f55b058202
DIST icinga-1.3.1.tar.gz 12158923 RMD160 b0b82ef3e9eb999493af3ce26f9252661d34fdaa SHA1 fb2e87ed5edbb86d9476bce9487811c7b2ed1f16 SHA256 b6eec308091a9b87b885e57e41184c496de0894660dd833074ecf4dd2cf180e0
-EBUILD icinga-1.3.1-r2.ebuild 6220 RMD160 1dcfe16d426bbc05f602af643254820fbeb2d458 SHA1 bd069ccc397a25a5f1c3f8ed7843ba5abb202d89 SHA256 923eca3026b8a26a265b61748b2f53974f2e0b3b984fba029468d79e7b581288
-MISC ChangeLog 3694 RMD160 1f992baa74a18b17d1f7cb2b4a9a73840ddff1f6 SHA1 c5ee5095f8ada32cbbface8ac3a30b6c1983da01 SHA256 045f06d819e9469de1226deb0052af2a3e090b3d68af8cec4af8365e12f23dc9
+EBUILD icinga-1.3.1-r3.ebuild 6220 RMD160 1dcfe16d426bbc05f602af643254820fbeb2d458 SHA1 bd069ccc397a25a5f1c3f8ed7843ba5abb202d89 SHA256 923eca3026b8a26a265b61748b2f53974f2e0b3b984fba029468d79e7b581288
+MISC ChangeLog 3864 RMD160 1b50d728e39d9df1e5996f9bdc917229bda37f60 SHA1 66927bfe8fe500f38683ed89d8044094bedf2673 SHA256 02a41bbc0481f0dc8c53c5327707f64c46edc2511927c7d198c746c28558d326
MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e
diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d
index aed7a78ea..946f3be29 100644
--- a/net-analyzer/icinga/files/ido2db-init.d
+++ b/net-analyzer/icinga/files/ido2db-init.d
@@ -4,6 +4,16 @@
# $Header: $
IDO2DBBIN="/usr/sbin/ido2db"
+SOCKET="/var/icinga/ido.sock"
+
+function check() {
+ if [[ -S "${SOCKET}" ]] ; then
+ ewarn "Strange, the socket file already exist in \"${SOCKET}\""
+ ewarn "it will be removed now and re-created by ido2db"
+ ewarn "BUT please make your checks."
+ rm -f "${SOCKET}"
+ fi
+}
depend() {
need net
@@ -12,6 +22,7 @@ depend() {
}
start() {
+ check
ebegin "Starting ido2db"
start-stop-daemon --quiet --start --pidfile /var/icinga/ido2db.lock --startas ${IDO2DBBIN} -- -c ${IDO2DBCFG}
eend $?
diff --git a/net-analyzer/icinga/icinga-1.3.1-r2.ebuild b/net-analyzer/icinga/icinga-1.3.1-r3.ebuild
index 955e46ddb..955e46ddb 100644
--- a/net-analyzer/icinga/icinga-1.3.1-r2.ebuild
+++ b/net-analyzer/icinga/icinga-1.3.1-r3.ebuild