author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sat, 8 Nov 2008 08:01:12 +0000 (09:01 +0100) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sat, 8 Nov 2008 08:01:12 +0000 (09:01 +0100) |
diff --git a/contrib/exec-munin.px b/contrib/exec-munin.px
index 223a8a5ecf9c84e811a427751abe69ed4ca89b06..9163730c6e8c61041b288a9e538f4c8956948dbe 100755 (executable)
--- a/contrib/exec-munin.px
+++ b/contrib/exec-munin.px
can use a hyphen to add a "type instance" to the type.
For a list of already defined "types" look at the F<types.db> file in
-collectd's library path, e.E<nbsp>g. F</usr/lib/collectd/>.
+collectd's shared data directory, e.E<nbsp>g. F</usr/share/collectd/>.
=item B<Interval> I<Seconds>
index 89ce1237499395aaad888badce63528810ebf103..35eb8bec1eb61e1d74bd63f9cfa326cd0d3e15b6 100644 (file)
%attr(0644,root,root) %{_libdir}/%{name}/wireless.so*
%attr(0644,root,root) %{_libdir}/%{name}/wireless.la
-%attr(0644,root,root) %{_libdir}/%{name}/types.db
+%attr(0644,root,root) %{_datadir}/%{name}/types.db
%dir /var/lib/collectd
index 7a026fac0cfd6484a74145ed52f83fe0b8935a09..0aaaee317bcfb71c7689e4181fe1e873fe33cc2c 100644 (file)
BaseDir "/var/lib/collectd"
PIDFile "/var/run/collectd.pid"
PluginDir "/usr/lib/collectd"
-TypesDB "/usr/lib/collectd/types.db"
+TypesDB "/usr/share/collectd/types.db"
Interval 10
ReadThreads 5
index bce76473382112f2f32714ef593dd00fee7624b3..62acc184acf7c31c4cf368d00187b55c62afd69c 100644 (file)
sed -i 's:#BaseDir "/usr/var/lib/collectd":BaseDir "/var/lib/collectd":' $RPM_BUILD_ROOT/etc/collectd.conf
sed -i 's:#PIDFile "/usr/var/run/collectd.pid":PIDFile "/var/run/collectd.pid":' $RPM_BUILD_ROOT/etc/collectd.conf
sed -i 's:#PluginDir "/usr/lib/collectd":PluginDir "/usr/lib/collectd":' $RPM_BUILD_ROOT/etc/collectd.conf
-sed -i 's:#TypesDB "/usr/lib/collectd/types.db":TypesDB "/usr/lib/collectd/types.db":' $RPM_BUILD_ROOT/etc/collectd.conf
+sed -i 's:#TypesDB "/usr/share/collectd/types.db":TypesDB "/usr/share/collectd/types.db":' $RPM_BUILD_ROOT/etc/collectd.conf
sed -i 's:#Interval 10:Interval 10:' $RPM_BUILD_ROOT/etc/collectd.conf
sed -i 's:#ReadThreads 5:ReadThreads 5:' $RPM_BUILD_ROOT/etc/collectd.conf
##Move config contribs
%attr(0644,root,root) %{_libdir}/%{name}/wireless.so*
%attr(0644,root,root) %{_libdir}/%{name}/wireless.la
-%attr(0644,root,root) %{_libdir}/%{name}/types.db
+%attr(0644,root,root) %{_datadir}/%{name}/types.db
%exclude %{_libdir}/perl5/5.8.8/%{_arch}-linux-thread-multi/perllocal.pod
%attr(0644,root,root) %{_libdir}/perl5/site_perl/5.8.8/Collectd.pm
diff --git a/src/Makefile.am b/src/Makefile.am
index cf89c9a14e3cb2ff2deea7369865a98e6bc899ae..b6d1a08542ef7231ce73d7987dcaeeb896e3b2d7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
else \
$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
fi; \
- cp -f $(srcdir)/types.db $(DESTDIR)$(pkglibdir)/;
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ $(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
$(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 28004afa6f049fe9bd1d9beb0db7bdf1e227376e..cdbef5a19dec66b3ac6e6f50bd54737862c95455 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
#BaseDir "@prefix@/var/lib/@PACKAGE_NAME@"
#PIDFile "@prefix@/var/run/@PACKAGE_NAME@.pid"
#PluginDir "@prefix@/lib/@PACKAGE_NAME@"
-#TypesDB "@prefix@/lib/@PACKAGE_NAME@/types.db"
+#TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db"
#Interval 10
#ReadThreads 5
diff --git a/src/configfile.c b/src/configfile.c
index b1030fe939098ce818bb44e88a87c7137164df14..f9c20fc3116bed1f2f8a54b8fa87c4dc77da4a19 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
/* Read the default types.db if no `TypesDB' option was given. */
if (cf_default_typesdb)
- read_types_list (PLUGINDIR"/types.db");
+ read_types_list (PKGDATADIR"/types.db");
return (0);
} /* int cf_read */
diff --git a/src/types.db.pod b/src/types.db.pod
index f0a49f6b96e52e09b8b229ebd40922d96ad7afd7..11c7f794c248568306d97ed5b5931c834089aff4 100644 (file)
--- a/src/types.db.pod
+++ b/src/types.db.pod
=head1 FILES
The location of the types.db file is defined by the B<TypesDB> configuration
-option (see L<collectd.conf(5)>). If you want to specify custom data-sets, you
-should do so by using a custom file specified as an additional argument to the
-B<TypesDB> option.
+option (see L<collectd.conf(5)>). It defaults to collectd's shared data
+directory, i.E<nbsp>e. F<I<prefix>/share/collectd/>. If you want to specify
+custom data-sets, you should do so by using a custom file specified as an
+additional argument to the B<TypesDB> option.
=head1 SEE ALSO