diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2011-12-04 14:20:09 -0500 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2011-12-04 14:20:09 -0500 |
| commit | 1561b72ce361d2db9de3a44f3fc1ab2367179e13 (patch) | |
| tree | bd18b786136dc393c17ef2b886e4e4256e3b1b79 /net-analyzer | |
| parent | forgot manifest (diff) | |
| download | prometheanfire-1561b72ce361d2db9de3a44f3fc1ab2367179e13.tar.gz prometheanfire-1561b72ce361d2db9de3a44f3fc1ab2367179e13.tar.bz2 prometheanfire-1561b72ce361d2db9de3a44f3fc1ab2367179e13.zip | |
updated init scripts
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/icinga/Manifest | 4 | ||||
| -rwxr-xr-x | net-analyzer/icinga/files/icinga-init.d-2 | 4 | ||||
| -rw-r--r-- | net-analyzer/icinga/files/ido2db-init.d | 13 |
3 files changed, 11 insertions, 10 deletions
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest index ac06641..4c0a6c6 100644 --- a/net-analyzer/icinga/Manifest +++ b/net-analyzer/icinga/Manifest @@ -1,10 +1,10 @@ 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-2 972 RMD160 4ca4966313542b7daf8e5e234fe09ee39055f275 SHA1 3c4073287261f1b7db5d8d658544e6b49c5f938a SHA256 affec920a70a5209c9c5f2208847844e409df11041cd8a2fd67d833ae14ececa +AUX icinga-init.d-2 999 RMD160 c217fe01d49a4e29b22fd1c2a9125918fd1ccc69 SHA1 f791fa9a1b70b4593afd84adaafeb6bcffcb7931 SHA256 f94dc546ca1a45f67b3d79aff39f937a5fb0b6ca19de3110f30e09d7a0c6bf08 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 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf09a34fe55dd49c3381ca11781a643e4d1ca0 SHA256 88913ba8d8d2824e52ea26d93bdb7587d6ab53020546a6a98c9e9d337cc17985 +AUX ido2db-init.d 990 RMD160 505b54e4ca4cc7ce4771680837a937c0416d9394 SHA1 a2e733b5b4808e360736f82f47ba3cf88a40cc4c SHA256 9d460516288fb6a43907df8e51392f974ab3ab5c10d7d9ba2297fe7acb024186 DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b diff --git a/net-analyzer/icinga/files/icinga-init.d-2 b/net-analyzer/icinga/files/icinga-init.d-2 index 062a33a..8f05cc7 100755 --- a/net-analyzer/icinga/files/icinga-init.d-2 +++ b/net-analyzer/icinga/files/icinga-init.d-2 @@ -1,11 +1,11 @@ #!/sbin/runscript -opts="${opts} reload checkconfig" +extra_commands="${extra_commands} reload checkconfig" depend() { need net use dns logger firewall - after mysql postgresql + after mysql postgresql ido2db } reload() diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d index 75051ab..8763731 100644 --- a/net-analyzer/icinga/files/ido2db-init.d +++ b/net-analyzer/icinga/files/ido2db-init.d @@ -4,14 +4,15 @@ # $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d,v 1.1 2011/11/15 00:14:29 prometheanfire Exp $ IDO2DBBIN="/usr/sbin/ido2db" -SOCKET="/var/icinga/ido.sock" +IDO2DBSOCKET="/var/lib/icinga/ido.sock" +IDO2DBLOCK="/var/lib/icinga/ido2db.lock" function check() { - if [ -S "${SOCKET}" ] ; then - ewarn "Strange, the socket file already exist in \"${SOCKET}\"" + if [ -S "${IDO2DBSOCKET}" ] ; then + ewarn "Strange, the socket file already exist in \"${IDO2DBSOCKET}\"" ewarn "it will be removed now and re-created by ido2db" ewarn "BUT please make your checks." - rm -f "${SOCKET}" + rm -f "${IDO2DBSOCKET}" fi } @@ -24,12 +25,12 @@ depend() { start() { check ebegin "Starting ido2db" - start-stop-daemon --quiet --start --pidfile /var/icinga/ido2db.lock --startas ${IDO2DBBIN} -- -c ${IDO2DBCFG} + start-stop-daemon --start --exec ${IDO2DBBIN} --pidfile ${IDO2DBLOCK} --name ${IDO2DBBIN} -- -c ${IDO2DBCFG} eend $? } stop() { ebegin "Stopping ido2db" - start-stop-daemon --quiet --stop --pidfile /var/icinga/ido2db.lock --name /usr/sbin/ido2db + start-stop-daemon --stop --exec ${IDO2DBBIN} --pidfile ${IDO2DBLOCK} --name ${IDO2DBBIN} eend $? } |