service dependencies added.
This commit is contained in:
Micha Glave
parent
315aa4c526
commit
de4a5df456
@ -1,7 +1,4 @@
|
|||||||
AUX shinken-0.6.5.patch 4004 RMD160 5e96245063b4ecf078387ea5e544e660b69589e5 SHA1 7a74294471276b24b8717252bb71a0eeb99ed16f SHA256 f76cf0a99d8787f80ba498acbd5aeb6651a588fc5f75c4d765d572400f3ea053
|
AUX shinken.confd 2002 RMD160 2edcbf05ccae63fa0ee1ed4c9276c131ae9cf0e0 SHA1 acca0dd2243e5050bc6a1445296e2ddb821339c1 SHA256 cbc7852564ca657fb4bfb3f38e05b0ff9778b914ee8709f6d40dbebc55aa931c
|
||||||
AUX shinken.confd 1983 RMD160 4158fd08841fce97f4f756d153f2be9e2b67f59f SHA1 6222d9738db7efecdf62bc46a5344ff5ae8fa2ad SHA256 30b17ec488faf4a6060789dea554e65771687971bf7615d8b1087da431520752
|
AUX shinken.initd 1518 RMD160 93e1b2fb585ea5d6b29f9dcc395daae518b215d9 SHA1 d438bdff280ef962158c932d6aa6897e5d50363b SHA256 5e3e92b9d203446024ee2fe0b0b9cb19d1af5fbf68809a0fd5efd9420f46894e
|
||||||
AUX shinken.initd 1410 RMD160 e4bffd0de22d0c57ef4ae114ca87eea4013a1f9d SHA1 5ca19b7a903424e232c3601c1d5df7b30ee0ba75 SHA256 55dd1d5d393876c256722fab5185123b9aef38fe8a496a6148c3f843ce818ee0
|
|
||||||
DIST shinken-0.6.5.tar.gz 5155015 RMD160 73d3646d092aa0d92474b31257b8c73c252dbc19 SHA1 62ee08fb290570484cb50979ed75791cd83a6a18 SHA256 ff08fb8a9ec669732316d3b2bd4423572efc2123482cbb8128b71c08aad64deb
|
|
||||||
DIST shinken-1.0.1.tar.gz 8039760 RMD160 caae07573bdc040925e7854cc39c148f42a45626 SHA1 cf11d54160e9ee3725443ca6afc6be2c55532a72 SHA256 811da51e80f2b32a2c6d0114ce90efe9e091aefd82489d21df35e0426f99fbfb
|
DIST shinken-1.0.1.tar.gz 8039760 RMD160 caae07573bdc040925e7854cc39c148f42a45626 SHA1 cf11d54160e9ee3725443ca6afc6be2c55532a72 SHA256 811da51e80f2b32a2c6d0114ce90efe9e091aefd82489d21df35e0426f99fbfb
|
||||||
EBUILD shinken-0.6.5.ebuild 2249 RMD160 ee5355d1400511324c46b873fbae179cca91cf51 SHA1 c988e695fbba38e11de13ca226fb82fab0020b9c SHA256 9db817725f738f8243ffa4f731e896ed3b9cbb674270fabdcb3e25c8d784e622
|
EBUILD shinken-1.0.1.ebuild 2810 RMD160 8693bd23abaf39a97181955ffd88fb5dabe43a71 SHA1 09f27f8b83a704641b9c18e86446ecfd33d768b3 SHA256 2acc365fe82c519733879248d05bd3b6e1cd5d00a66566fb1c2bc1def00a81de
|
||||||
EBUILD shinken-1.0.1.ebuild 2530 RMD160 aec9439672470a67d8baf7dd39c321fc8cce7e84 SHA1 43c8d30fecd6e3428c8fcc694753e7fa95635a66 SHA256 4686cb66a7555e0fd2beed9f70a543337ddd33fd4377e4bd4fb6f46e721b98fc
|
|
||||||
|
|||||||
@ -1,97 +0,0 @@
|
|||||||
--- /root/setup.py.org 2011-07-19 13:18:36.274866779 +0200
|
|
||||||
+++ shinken-0.6.5/setup.py 2011-07-19 13:26:14.922605481 +0200
|
|
||||||
@@ -174,9 +174,9 @@
|
|
||||||
buf = f.read()
|
|
||||||
f.close
|
|
||||||
# substitute
|
|
||||||
- buf = buf.replace("$ETC$", self.etc_path)
|
|
||||||
- buf = buf.replace("$VAR$", self.var_path)
|
|
||||||
- buf = buf.replace("$SCRIPTS_BIN$", self._install_scripts)
|
|
||||||
+ buf = buf.replace("$ETC$", "/etc/shinken")
|
|
||||||
+ buf = buf.replace("$VAR$", "/var/lib/shinken")
|
|
||||||
+ buf = buf.replace("$SCRIPTS_BIN$", "/usr/bin")
|
|
||||||
# write out the new file
|
|
||||||
f = open(outfile, "w")
|
|
||||||
f.write(buf)
|
|
||||||
@@ -192,21 +192,19 @@
|
|
||||||
for name in daemon_ini_files:
|
|
||||||
inname = os.path.join('etc', name)
|
|
||||||
outname = os.path.join(self.build_dir, name)
|
|
||||||
- log.info('updating path in %s : to "%s"' % (outname, self.var_path))
|
|
||||||
+ log.info('updating path in %s : to "%s"' % (outname, "/var/lib/shinken"))
|
|
||||||
|
|
||||||
if False:
|
|
||||||
## disabled for now:
|
|
||||||
## all daemons are now using relative paths by default
|
|
||||||
## (relative to the "VAR" one of /etc/default/shinken)
|
|
||||||
update_file_with_string(inname, outname,
|
|
||||||
- "../var", self.var_path)
|
|
||||||
+ "../var", "/var/lib/shinken")
|
|
||||||
|
|
||||||
# but we have to force the user/group & workdir values still:
|
|
||||||
append_file_with(inname, outname, """
|
|
||||||
-user=%s
|
|
||||||
-group=%s
|
|
||||||
workdir=%s
|
|
||||||
-""" % ( self.owner, self.group, self.var_path, ))
|
|
||||||
+""" % ( "/var/lib/shinken", ))
|
|
||||||
|
|
||||||
# And now the resource.cfg path with the value of libexec path
|
|
||||||
# Replace the libexec path by the one in the parameter file
|
|
||||||
@@ -216,7 +214,7 @@
|
|
||||||
log.info('updating path in %s', outname)
|
|
||||||
update_file_with_string(inname, outname,
|
|
||||||
"/usr/local/shinken/libexec",
|
|
||||||
- self.plugins_path)
|
|
||||||
+ "/usr/lib/nagios/plugins")
|
|
||||||
|
|
||||||
# And update the nagios.cfg file for all /usr/local/shinken/var
|
|
||||||
# value with good one
|
|
||||||
@@ -230,7 +228,7 @@
|
|
||||||
## nagios.cfg & shinken-specific use now relative paths (relative to the "VAR" one)
|
|
||||||
update_file_with_string(inname, outname,
|
|
||||||
"/usr/local/shinken/var",
|
|
||||||
- self.var_path)
|
|
||||||
+ "/var/lib/shinken")
|
|
||||||
|
|
||||||
## but we HAVE to set the shinken_user & shinken_group to thoses requested :
|
|
||||||
append_file_with(inname, outname, """
|
|
||||||
@@ -416,7 +414,7 @@
|
|
||||||
},
|
|
||||||
|
|
||||||
name = "Shinken",
|
|
||||||
- version = "0.6",
|
|
||||||
+ version = "0.6.5",
|
|
||||||
packages = find_packages(),
|
|
||||||
package_data = {'':['*.py','modules/*.py','modules/*/*.py']},
|
|
||||||
description = "Shinken is a monitoring tool compatible with Nagios configuration and plugins",
|
|
||||||
@@ -484,29 +482,6 @@
|
|
||||||
glob('etc/certs/[!_]*.pem')
|
|
||||||
),
|
|
||||||
|
|
||||||
- (
|
|
||||||
- os.path.join('/etc', 'init.d'),
|
|
||||||
- [
|
|
||||||
- 'bin/init.d/shinken',
|
|
||||||
- 'bin/init.d/shinken-arbiter',
|
|
||||||
- 'bin/init.d/shinken-broker',
|
|
||||||
- 'bin/init.d/shinken-receiver',
|
|
||||||
- 'bin/init.d/shinken-poller',
|
|
||||||
- 'bin/init.d/shinken-reactionner',
|
|
||||||
- 'bin/init.d/shinken-scheduler'
|
|
||||||
- ]
|
|
||||||
- ),
|
|
||||||
-
|
|
||||||
- (
|
|
||||||
- os.path.join(etc_root, 'default',),
|
|
||||||
- [ 'build/bin/default/shinken' ]
|
|
||||||
- ),
|
|
||||||
-
|
|
||||||
- (
|
|
||||||
- default_paths['var'],
|
|
||||||
- [ 'var/void_for_git' ]
|
|
||||||
- ),
|
|
||||||
-
|
|
||||||
(
|
|
||||||
default_paths['libexec'], ['libexec/check.sh']
|
|
||||||
),
|
|
||||||
@ -82,3 +82,4 @@ RECEIVERDEBUGFILE="/var/log/shinken/receiver-debug.log"
|
|||||||
# nicelevel to run nagios daemon with
|
# nicelevel to run nagios daemon with
|
||||||
NICENESS=5
|
NICENESS=5
|
||||||
|
|
||||||
|
SHINKENSERVICES=""
|
||||||
|
|||||||
@ -15,7 +15,6 @@ eval DEBUGFILE="\${${_MODULE}DEBUGFILE}"
|
|||||||
eval CONFIGFILE="\${${_MODULE}CFG}"
|
eval CONFIGFILE="\${${_MODULE}CFG}"
|
||||||
eval PIDFILE="\${${_MODULE}PID}"
|
eval PIDFILE="\${${_MODULE}PID}"
|
||||||
SHINKENM="/usr/bin/shinken-${MODULE}"
|
SHINKENM="/usr/bin/shinken-${MODULE}"
|
||||||
NEED="net"
|
|
||||||
|
|
||||||
if [ -r "${CONFIGFILE}" ] ; then
|
if [ -r "${CONFIGFILE}" ] ; then
|
||||||
tmppid=`grep 'pidfile=' ${CONFIGFILE} | grep -v '#' | tail -n 1 | awk -F '=' '{print $2}'`
|
tmppid=`grep 'pidfile=' ${CONFIGFILE} | grep -v '#' | tail -n 1 | awk -F '=' '{print $2}'`
|
||||||
@ -28,6 +27,9 @@ fi
|
|||||||
|
|
||||||
depend() {
|
depend() {
|
||||||
need net
|
need net
|
||||||
|
if [ $SVCNAME = "shinken" ]; then
|
||||||
|
need ${SHINKENSERVICES}
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
@ -55,3 +57,6 @@ check() {
|
|||||||
"/usr/bin/shinken-arbiter" -v --config "${ARBITERCFG}" --config "${SHINKENSPECIFICCFG}" $DEBUGCMD 2>&1
|
"/usr/bin/shinken-arbiter" -v --config "${ARBITERCFG}" --config "${SHINKENSPECIFICCFG}" $DEBUGCMD 2>&1
|
||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
|
||||||
|
|
||||||
|
|||||||
@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
|
|||||||
!net-analyzer/nagios"
|
!net-analyzer/nagios"
|
||||||
|
|
||||||
SHINKENMODULES="arbiter broker poller reactionner receiver scheduler"
|
SHINKENMODULES="arbiter broker poller reactionner receiver scheduler"
|
||||||
|
CHOOSEN_MODULES=""
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
local -i modnum=0
|
local -i modnum=0
|
||||||
@ -35,6 +36,7 @@ src_configure() {
|
|||||||
for mod in ${SHINKENMODULES}; do
|
for mod in ${SHINKENMODULES}; do
|
||||||
if use $mod; then
|
if use $mod; then
|
||||||
let modnum++
|
let modnum++
|
||||||
|
CHOOSEN_MODULES="${CHOOSEN_MODULES}${PN}.${mod} "
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
if [[ "${modnum}" -lt 1 ]]; then
|
if [[ "${modnum}" -lt 1 ]]; then
|
||||||
@ -101,6 +103,13 @@ src_install() {
|
|||||||
ln -s ${PN} ${PN}.${mod} || die
|
ln -s ${PN} ${PN}.${mod} || die
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
# adding services dependency
|
||||||
|
sed -i -e "s:^\(SHINKENSERVICES=\).*:\1\"${CHOOSEN_MODULES}\":" \
|
||||||
|
${D}/etc/conf.d/${PN} || die
|
||||||
|
# fixing path
|
||||||
|
cd ${D}/etc/${PN}
|
||||||
|
sed -i -e "s:${D}:/:" \
|
||||||
|
*.cfg *d.ini || die
|
||||||
}
|
}
|
||||||
|
|
||||||
pkg_setup() {
|
pkg_setup() {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user