[checkmk-commits] rrdcached can now read tuning options from etc/ rrdcached.d directory in addition to etc/rrdcached.conf

Module: check_mk Branch: master Commit: 929d29b2e686fb196b2cc525baab10f62d16131a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=929d29b2e686fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 23 14:36:22 2017 +0200 rrdcached can now read tuning options from etc/rrdcached.d directory in addition to etc/rrdcached.conf Change-Id: I2ce63f7054747cf3cef303cb025c3c3aab593be9 --- omd/packages/rrdtool/skel/etc/init.d/rrdcached | 12 +++++++++--- omd/packages/rrdtool/skel/etc/rrdcached.d/.gitignore | 0 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/omd/packages/rrdtool/skel/etc/init.d/rrdcached b/omd/packages/rrdtool/skel/etc/init.d/rrdcached index 5fce7e4..174316b 100644 --- a/omd/packages/rrdtool/skel/etc/init.d/rrdcached +++ b/omd/packages/rrdtool/skel/etc/init.d/rrdcached @@ -30,9 +30,15 @@ if [ -e "$CONFFILE" ] ; then . $CONFFILE fi -TIMING="" - - +CONFDIR=$OMD_ROOT/etc/rrdcached.d +if [ -d $CONFDIR ]; then + for i in $CONFDIR/*.conf; do + if [ -r $i ]; then + . $i + fi + done + unset i +fi # Please do not touch the code below CACHE_DIR="###ROOT###/tmp/rrdcached" diff --git a/omd/packages/rrdtool/skel/etc/rrdcached.d/.gitignore b/omd/packages/rrdtool/skel/etc/rrdcached.d/.gitignore new file mode 100644 index 0000000..e69de29