diff options
| author |   Andreas K. Huettel <mail@akhuettel.de> | 2010-12-16 17:49:13 +0100 |
|---|---|---|
| committer | Andreas K. Huettel <mail@akhuettel.de> | 2010-12-16 17:49:13 +0100 |
| commit | 8d4efaa0c0dfaf0ceeeca08b8ca68012d83f18b8 (patch) | |
| tree | 9fb8dafbd83d60d01dfb27119433b3399725a92e | |
| parent | [app-admin/collectd] Added oracle support from Aurelien Minet to ebuild (diff) | |
| download | dilfridge-8d4efaa0c0dfaf0ceeeca08b8ca68012d83f18b8.tar.gz dilfridge-8d4efaa0c0dfaf0ceeeca08b8ca68012d83f18b8.tar.bz2 dilfridge-8d4efaa0c0dfaf0ceeeca08b8ca68012d83f18b8.zip | |
[app-admin/collectd] Added oracle and checkconfig features to init script
(Portage version: 2.1.9.25/git/Linux i686, unsigned Manifest commit)
| -rw-r--r-- | app-admin/collectd/ChangeLog | 4 | ||||
| -rw-r--r-- | app-admin/collectd/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/collectd/files/collectd.initd | 30 |
3 files changed, 36 insertions, 2 deletions
diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog index d36237f..1bc481f 100644 --- a/app-admin/collectd/ChangeLog +++ b/app-admin/collectd/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org> + files/collectd.initd: + Added oracle and checkconfig features to init script + 15 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org> collectd-4.10.2.ebuild, +files/collectd-4.10.2-libocci.patch: Added oracle support from Aurelien Minet to ebuild diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest index 4c63af9..4cd98d4 100644 --- a/app-admin/collectd/Manifest +++ b/app-admin/collectd/Manifest @@ -4,7 +4,7 @@ AUX collectd-4.10.1-noowniptc.patch 837 RMD160 433d936a3c8d22af289ab9ecc00a9843a AUX collectd-4.10.1-werror.patch 2005 RMD160 c06320ac7a189de421faabeb377c957f15c757b8 SHA1 6b130c57f63d6aafccbe0fff42edb490030c92ae SHA256 38a704b07121f56494daff59366de1f4793a5d357ed1000de01eafed2e350f60 AUX collectd-4.10.2-libocci.patch 720 RMD160 c90872f76a771076efe500c78dc3e3a5545f8f51 SHA1 40197f33a565ea37774f577c036b1c75ef447cae SHA256 2338b8405e46d67bc71ebe4d4f8cba8658047a352cb7b0c3c0f4b15109a9c98b AUX collectd.confd 633 RMD160 46f81e3f73d577c3f59df404012e33c419188acc SHA1 85f569035bbb6ff7d3e03a4b85c35ccb126c29a4 SHA256 30e41d63f3af1d736d86903046e5aac8f8a548714bab0acbbca0ffd6c16ed430 -AUX collectd.initd 749 RMD160 ca0ea7029c5646299733b1e75e6cbfc2307f175f SHA1 52dbfc6a26998afc2059180114b872f439ba4ca1 SHA256 31566ee872442d64e20f0431d7e0687725eb4fe1c03b84fe5b9c5cec79d3c570 +AUX collectd.initd 1475 RMD160 47950563900702075f1d429c70a9b00bd19addc1 SHA1 ce61a9ea693a749ba6fe14e9d0bda9124a142f8f SHA256 4f51375e2d8b1543bcbf5c72257a45ed5a10edfe29b95d819a9087de307bbfda AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c DIST collectd-4.10.1.tar.bz2 1415626 RMD160 f609f70bd7bb789ab54ca72edd34c3753692ff00 SHA1 bda5c918761b98e82fa18da056f60916703b5805 SHA256 607ea5d22164eaf434223dd39a1df453103e2f3c2f2b8c1dbfc1531eefb6df56 DIST collectd-4.10.2.tar.bz2 1419603 RMD160 13db504beb5cd560d60014183b67ce768fe4293e SHA1 8d83dd2d68ac4c0871774af99079564880abb5ef SHA256 17cd6741c360cb2544f00fbe902ec3e9aa0d04a7ab6a744e3e8ea5615bb794be @@ -12,6 +12,6 @@ EBUILD collectd-4.10.1-r2.ebuild 9956 RMD160 5e745db3aef65ee506c9a7895a2c66f8904 EBUILD collectd-4.10.1-r3.ebuild 10150 RMD160 61df6b93fa6399f564a7b36c9a759c046f92c99b SHA1 058f6c4792aa7a99a259dc89a4bee814b3783279 SHA256 c7453da4f66f4b436599f74c3d731fd619bc7834e21cdcd733eb6165618b4e6c EBUILD collectd-4.10.1-r4.ebuild 10169 RMD160 2e58557e4b1491c49ce296b13934d7a8ed0f98c8 SHA1 22bf8e122db1b0ce7a08a605200e9920752702df SHA256 63b708a3addf663126800fe93df31e6cfa78d961c049605cf13cc4175c2cc770 EBUILD collectd-4.10.2.ebuild 10592 RMD160 16570e9e090eecb4c9c69d4b331d529f6074d188 SHA1 e2c9c909abaa0436eced0cfbb62dd1b3359036dd SHA256 eac5dcbebcefa18d510466047055d1578d760245a2b5e69632db786cb350c357 -MISC ChangeLog 4316 RMD160 38d3e286348a6f663f9e3004b5ce8b1e9ab7edc6 SHA1 5959b5b29734b677690252548e958b61838ecb7f SHA256 3709253ec82554eee46d45a724396f5ff27ccbf664b155f5390877de02467ae4 +MISC ChangeLog 4453 RMD160 1cf48963f03a64ae5c3e48b37dd1ea4efda0ebed SHA1 4e1f98532c96074147eb8e5565c1e5346d68e069 SHA256 7d269d9c633016709740e9a798d314417cf44d1191f7d77e560004b09a46a15c MISC metadata.xml 11154 RMD160 cc4cd6e71b9f80844be5de445f8c3928efd41ba9 SHA1 ecd8157d3ca7298f46313c57711e782b7074f8a1 SHA256 54f495238df08bbd25f964145650567e45492f5117c8dd4dc7604896df804195 MISC notes.txt 2089 RMD160 cd61c2757dc1a147bc1b9172bbff940cc6cfdc87 SHA1 81e49e513986406e37af00ed9511893f59699f4d SHA256 87515a0ad5131bf44bdba5f257b8b61beea9b7825f1db5501de9ae3551be72e6 diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd index 002620a..8417941 100644 --- a/app-admin/collectd/files/collectd.initd +++ b/app-admin/collectd/files/collectd.initd @@ -7,12 +7,42 @@ : ${COLLECTD_CFGFILE:='/etc/collectd.conf'} : ${COLLECTD_NICELVL:='5'} +opts="${opts} configtest" depend() { use net } +configtest() { + ebegin "Checking ${SVCNAME} configuration" + checkconfig + eend $? +} + +checkconfig() { + if [[ $(sed '/^$\|^#/d' ${COLLECTD_CFGFILE} | grep -c 'LoadPlugin\w\+oracle') != 0 ]] ; then + if [[ -e /etc/env.d/50oracle-instantclient-basic ]] ; then + source /etc/env.d/50oracle-instantclient-basic + export ORACLE_HOME + export TNS_ADMIN + else + ewarn "Unable to set Oracle environment, Oracle plugin wont work" + fi + fi + + /usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}" 1>/dev/null 2>&1 + ret=$? + if [ $ret -ne 0 ]; then + eerror "${SVCNAME} has detected an error in your setup:" + /usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}" + fi + + return $ret +} + start() { + checkconfig || return 1 + ebegin "Starting collectd" start-stop-daemon --start \ --nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \ |