aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/conf
diff options
context:
space:
mode:
authorPim van den Berg2014-06-24 12:49:26 +0200
committerPim van den Berg2014-06-24 12:49:26 +0200
commit30692ffbbd64ebac48d7d77ec39ae226779e547a (patch)
treeabee5d81cd7c2fe61e5288b4dac14586d46918c2 /conf
parentMerge remote-tracking branch 'feandil/for_upstream_lvm' (diff)
parentAdd support for multiple types db (diff)
downloadapt-panopticon_cgp-30692ffbbd64ebac48d7d77ec39ae226779e547a.zip
apt-panopticon_cgp-30692ffbbd64ebac48d7d77ec39ae226779e547a.tar.gz
apt-panopticon_cgp-30692ffbbd64ebac48d7d77ec39ae226779e547a.tar.bz2
apt-panopticon_cgp-30692ffbbd64ebac48d7d77ec39ae226779e547a.tar.xz
Merge remote-tracking branch 'dhchen/master'
Diffstat (limited to 'conf')
-rw-r--r--conf/config.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/config.php b/conf/config.php
index 3d54e26..e40cc9f 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -7,7 +7,7 @@ $CONFIG['version'] = 5;
7$CONFIG['datadir'] = '/var/lib/collectd/rrd'; 7$CONFIG['datadir'] = '/var/lib/collectd/rrd';
8 8
9# location of the types.db file 9# location of the types.db file
10$CONFIG['typesdb'] = '/usr/share/collectd/types.db'; 10$CONFIG['typesdb'][] = '/usr/share/collectd/types.db';
11 11
12# rrdtool executable 12# rrdtool executable
13$CONFIG['rrdtool'] = '/usr/bin/rrdtool'; 13$CONFIG['rrdtool'] = '/usr/bin/rrdtool';