From: "Matt Thode" <prometheanfire@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
Date: Mon, 14 May 2012 18:34:21 +0000 (UTC) [thread overview]
Message-ID: <1337020420.ff09f9f324836914ad1fdecb1c40f4de63e501bc.prometheanfire@gentoo> (raw)
commit: ff09f9f324836914ad1fdecb1c40f4de63e501bc
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 18:33:40 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon May 14 18:33:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=ff09f9f3
removed init.d-2 to fix shits
---
net-analyzer/icinga/Manifest | 9 ++--
net-analyzer/icinga/files/icinga-init.d | 34 ++++++++--------
net-analyzer/icinga/files/icinga-init.d-2 | 50 -------------------------
net-analyzer/icinga/icinga-1.6.1-r1.ebuild | 2 +-
net-analyzer/icinga/icinga-1.6.1-r2.ebuild | 2 +-
net-analyzer/icinga/icinga-1.7.0_beta1.ebuild | 2 +-
6 files changed, 24 insertions(+), 75 deletions(-)
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 13ff175..1c98f0d 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -2,15 +2,14 @@ AUX fix-prestripped-binaries-1.7.0.patch 724 RMD160 1cfb0b8de71baf93381c0bfb0fcf
AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7ef7923 SHA1 3664f9443b5f261d45a3420809f6d688b1a5df03 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957
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 1265 RMD160 7c3716d06b4b0e781d59ae07a8117b14def94b21 SHA1 467a5f683eaa545cd0979fbf4cbafcc3890bcba4 SHA256 febeb6ef97d8f0aa5de24f8152939a3003d1f5f8933b5bf96b048d02c216db95
+AUX icinga-init.d 1265 RMD160 7c3716d06b4b0e781d59ae07a8117b14def94b21 SHA1 467a5f683eaa545cd0979fbf4cbafcc3890bcba4 SHA256 febeb6ef97d8f0aa5de24f8152939a3003d1f5f8933b5bf96b048d02c216db95
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
DIST icinga-1.7.0beta1.tar.gz 12938996 RMD160 18d5b9c107a98400e9a564b34013b0159f987a9c SHA1 a468866974c86b2b04e3409961f58c7f20d2421d SHA256 5b218fdf83ce3f024def7d57413d0e2e597d82838d46d07ec811733088f185df
-EBUILD icinga-1.6.1-r1.ebuild 6966 RMD160 dc74f5db5ba287a878c89bdd409ffbce7bd10bf5 SHA1 4e0d1d97832e554d8db12fbd9d72996947fd3db1 SHA256 f73436e501d4984d61fe3e2f1ab0f338ab914baa91377f766b313806ab2de6b5
-EBUILD icinga-1.6.1-r2.ebuild 6961 RMD160 d75ffeb9562007091ac342e106e45154e10527b1 SHA1 2198bc9c8e17b3ff35a0503ecee059c13dec1b12 SHA256 097a3a082bdbb8f0264131445608130465ed7d2ecad1e35d4433022d12c22683
-EBUILD icinga-1.7.0_beta1.ebuild 7609 RMD160 6bbb5906be9352be5457378053e117cd51393e83 SHA1 492fe1758009017947da0c608fa30a8923de6d58 SHA256 969ff30909f3f7aedaccfb96a7c0252d300ca567a0c7f465b26e69171a1efb1a
+EBUILD icinga-1.6.1-r1.ebuild 6964 RMD160 8a5d24a7c2720ea577e65b64d8a0ebbf487b168b SHA1 3e5897629ce6cff3e00bd56dc9064095a6c84f73 SHA256 186a9cf8cbadc791c7ba7dcf15d7d0a2ce05b4e85d17837cf1b993c3e89c2129
+EBUILD icinga-1.6.1-r2.ebuild 6959 RMD160 3e9b5f213127d33939bc6a947a9a57c679a27bc1 SHA1 e15ada15d39639b71769bf37e06219a0b637a52b SHA256 7af2304fd680787a0aa41c86dddca14e284d9e54837edd3034a72d26a4b22873
+EBUILD icinga-1.7.0_beta1.ebuild 7607 RMD160 963c5cdedb7f914bb56116c1a47d88cf3ee3f659 SHA1 65fdcce64ec3796baddb1c30028a57010b325021 SHA256 3e7f4f78d567a6431d476ec383b7e7b6e0fe1c52da949c337db9d40a61774917
MISC ChangeLog 2671 RMD160 5b3d16a808c690a9de9fb3986e9da4d33087fc09 SHA1 c8a95d3a02d5e9519a65b5c9883610e203bf43cb SHA256 6ab976e5775c734aa8d619c29bbb3320e07774e893107512c5c7f8438ca0a4cb
MISC metadata.xml 656 RMD160 d127ece7480eec27f50e853ff0192e5854819ae5 SHA1 03e185a7f1bd4ed5b1356e9ddaa7b73038b7fa27 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6
diff --git a/net-analyzer/icinga/files/icinga-init.d b/net-analyzer/icinga/files/icinga-init.d
old mode 100644
new mode 100755
index f734f71..5ed3fb0
--- a/net-analyzer/icinga/files/icinga-init.d
+++ b/net-analyzer/icinga/files/icinga-init.d
@@ -1,19 +1,11 @@
#!/sbin/runscript
-opts="${opts} reload checkconfig"
+extra_commands="${extra_commands} reload checkconfig"
depend() {
need net
use dns logger firewall
- after mysql postgresql
-}
-
-reload()
-{
- checkconfig || return 1
- ebegin "Reloading configuration"
- killall -HUP icinga &>/dev/null
- eend $?
+ after mysql postgresql ido2db
}
checkconfig() {
@@ -24,20 +16,28 @@ checkconfig() {
eend $? "Configuration Error. Please fix your configfile"
}
-start() {
+reload()
+{
checkconfig || return 1
+ ebegin "Reloading configuration"
+ kill -HUP `cat /var/run/icinga/icinga.lock` &>/dev/null
+ eend $?
+}
+
+start() {
ebegin "Starting icinga"
- touch /var/icinga/icinga.log /var/icinga/status.sav
- chown icinga:icinga /var/icinga/icinga.log /var/icinga/status.sav
- rm -f /var/icinga/rw/icinga.cmd
- start-stop-daemon --quiet --start --startas /usr/sbin/icinga -e HOME="/var/icinga/home" --pidfile /var/icinga/icinga.lock -- -d /etc/icinga/icinga.cfg
+ checkpath -d -o icinga:icinga /tmp/icinga /var/run/icinga /var/log/icinga /var/lib/icinga
+ checkpath -f -o icinga:icinga /var/log/icinga/icinga.log
+ rm -f /var/lib/icinga/rw/icinga.cmd
+ start-stop-daemon --start --exec /usr/sbin/icinga -e HOME="/var/lib/icinga/home" --pidfile /var/run/icinga/icinga.pid -- -d /etc/icinga/icinga.cfg
eend $?
}
stop() {
ebegin "Stopping icinga"
- start-stop-daemon --quiet --stop --pidfile /var/icinga/icinga.lock
- rm -f /var/icinga/status.log /var/icinga/icinga.tmp /var/icinga/icinga.lock /var/icinga/rw/icinga.cmd
+ start-stop-daemon --stop --pidfile /var/run/icinga/icinga.pid
+ rm -f /var/lib/icinga/status.log /var/run/icinga/icinga.lock /var/lib/icinga/rw/icinga.cmd
+ rm -r /tmp/icinga
eend $?
}
diff --git a/net-analyzer/icinga/files/icinga-init.d-2 b/net-analyzer/icinga/files/icinga-init.d-2
deleted file mode 100755
index 5ed3fb0..0000000
--- a/net-analyzer/icinga/files/icinga-init.d-2
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-
-extra_commands="${extra_commands} reload checkconfig"
-
-depend() {
- need net
- use dns logger firewall
- 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
- ebegin "Reloading configuration"
- kill -HUP `cat /var/run/icinga/icinga.lock` &>/dev/null
- eend $?
-}
-
-start() {
- ebegin "Starting icinga"
- checkpath -d -o icinga:icinga /tmp/icinga /var/run/icinga /var/log/icinga /var/lib/icinga
- checkpath -f -o icinga:icinga /var/log/icinga/icinga.log
- rm -f /var/lib/icinga/rw/icinga.cmd
- start-stop-daemon --start --exec /usr/sbin/icinga -e HOME="/var/lib/icinga/home" --pidfile /var/run/icinga/icinga.pid -- -d /etc/icinga/icinga.cfg
- eend $?
-}
-
-stop() {
- ebegin "Stopping icinga"
- start-stop-daemon --stop --pidfile /var/run/icinga/icinga.pid
- rm -f /var/lib/icinga/status.log /var/run/icinga/icinga.lock /var/lib/icinga/rw/icinga.cmd
- rm -r /tmp/icinga
- eend $?
-}
-
-svc_restart() {
- checkconfig || return 1
- ebegin "Restarting icinga"
- svc_stop
- svc_start
- eend $?
-}
diff --git a/net-analyzer/icinga/icinga-1.6.1-r1.ebuild b/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
index a8fced0..bab1cbe 100644
--- a/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
@@ -112,7 +112,7 @@ src_install() {
emake DESTDIR="${D}" install-idoutils || die
fi
- newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
+ newinitd "${FILESDIR}"/icinga-init.d icinga || die
newconfd "${FILESDIR}"/icinga-conf.d icinga || die
if use idoutils ; then
newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
diff --git a/net-analyzer/icinga/icinga-1.6.1-r2.ebuild b/net-analyzer/icinga/icinga-1.6.1-r2.ebuild
index 0029df7..5a1994f 100644
--- a/net-analyzer/icinga/icinga-1.6.1-r2.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.1-r2.ebuild
@@ -112,7 +112,7 @@ src_install() {
emake DESTDIR="${D}" install-idoutils || die
fi
- newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
+ newinitd "${FILESDIR}"/icinga-init.d icinga || die
newconfd "${FILESDIR}"/icinga-conf.d icinga || die
if use idoutils ; then
newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
diff --git a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
index 0c34605..15ef04a 100644
--- a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
+++ b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
@@ -128,7 +128,7 @@ src_install() {
emake DESTDIR="${D}" install-eventhandlers || die
fi
- newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
+ newinitd "${FILESDIR}"/icinga-init.d icinga || die
newconfd "${FILESDIR}"/icinga-conf.d icinga || die
if use idoutils ; then
newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
next reply other threads:[~2012-05-14 18:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-14 18:34 Matt Thode [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-05-14 19:02 [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/ Matt Thode
2012-05-14 18:27 Matt Thode
2012-05-14 18:19 Matt Thode
2012-05-14 18:01 Matt Thode
2012-01-12 17:11 Matt Thode
2011-12-04 19:20 Matt Thode
2011-11-25 17:59 Matt Thode
2011-11-22 22:45 Matt Thode
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337020420.ff09f9f324836914ad1fdecb1c40f4de63e501bc.prometheanfire@gentoo \
--to=prometheanfire@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox