collectd.conf: (Un)comment plugins based on the configure-setting. Install the file...

What's not done yet is checking wether or not the (destination) file already
exists and _don't_ overwrite it.

diff --git a/configure.in b/configure.in
index a1dbca62fa11cc94d5bd94c988c6d8f793603d18..ce5899d5f347062b065b0180422cf3aa36f8bf0b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -921,7 +921,7 @@ AC_COLLECTD([users],     [disable], [module], [user count statistics])
 AC_COLLECTD([vserver],   [disable], [module], [vserver statistics])
 AC_COLLECTD([wireless],  [disable], [module], [wireless link statistics])
 
-AC_OUTPUT(Makefile src/Makefile src/libconfig/Makefile src/liboping/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libconfig/Makefile src/liboping/Makefile)
 
 cat <<EOF;
 

diff --git a/src/Makefile.am b/src/Makefile.am
index c868f5e7d9e915f0ca4e9f280577d5c00071e08a..a93045edd1bc029337fc5a2ac21c88c0e814744c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -374,10 +374,12 @@ collectd_LDADD += "-dlopen" wireless.la
 collectd_DEPENDENCIES += wireless.la
 endif
 
-man_MANS = collectd.1 collectd.conf.5
+sysconf_DATA = collectd.conf
+
+dist_man_MANS = collectd.1 collectd.conf.5
 #collectd_1_SOURCES = collectd.pod
 
-EXTRA_DIST = $(man_MANS)
+#EXTRA_DIST = $(man_MANS)
 
 .pod.1:
        pod2man --release=$(VERSION) --center=$(PACKAGE) $< >$@

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index bfeef927c29f291f69015a1ddd463a70504bd547..e1256f8126508efe796782b011e95bb23ed05dbd 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -5,43 +5,69 @@
 #
 
 Mode    Local
-DataDir   /var/lib/collectd
-PIDFile   /var/run/collectd.pid
-PluginDir /usr/lib/collectd
-
-#LoadPlugin apache
-#LoadPlugin battery
-LoadPlugin cpu
-LoadPlugin cpufreq
-LoadPlugin df
-LoadPlugin disk
-#LoadPlugin hddtemp
-LoadPlugin load
-LoadPlugin memory
-#LoadPlugin mysql
-LoadPlugin nfs
-LoadPlugin ping
-LoadPlugin processes
-#LoadPlugin sensors
-LoadPlugin serial
-LoadPlugin swap
-LoadPlugin traffic
-LoadPlugin users
-#LoadPlugin vserver
+#DataDir   /opt/collectd/var/lib/collectd
+#PIDFile   /opt/collectd/var/run/collectd.pid
+#PluginDir /opt/collectd/lib/collectd
+
+@BUILD_MODULE_APACHE_TRUE@LoadPlugin apache
+@BUILD_MODULE_APCUPS_TRUE@LoadPlugin apcups
+@BUILD_MODULE_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors
+@BUILD_MODULE_BATTERY_TRUE@LoadPlugin battery
+@BUILD_MODULE_CPU_TRUE@LoadPlugin cpu
+@BUILD_MODULE_CPUFREQ_TRUE@LoadPlugin cpufreq
+@BUILD_MODULE_DF_TRUE@LoadPlugin df
+@BUILD_MODULE_DISK_TRUE@LoadPlugin disk
+@BUILD_MODULE_HDDTEMP_TRUE@LoadPlugin hddtemp
+@BUILD_MODULE_LOAD_TRUE@LoadPlugin load
+@BUILD_MODULE_MEMORY_TRUE@LoadPlugin memory
+@BUILD_MODULE_MYSQL_TRUE@LoadPlugin mysql
+@BUILD_MODULE_NFS_TRUE@LoadPlugin nfs
+@BUILD_MODULE_NTPD_TRUE@LoadPlugin ntpd
+@BUILD_MODULE_PING_TRUE@LoadPlugin ping
+@BUILD_MODULE_PROCESSES_TRUE@LoadPlugin processes
+@BUILD_MODULE_SENSORS_TRUE@LoadPlugin sensors
+@BUILD_MODULE_SERIAL_TRUE@LoadPlugin serial
+@BUILD_MODULE_SWAP_TRUE@LoadPlugin swap
+@BUILD_MODULE_TAPE_TRUE@LoadPlugin tape
+@BUILD_MODULE_TRAFFIC_TRUE@LoadPlugin traffic
+@BUILD_MODULE_USERS_TRUE@LoadPlugin users
+@BUILD_MODULE_VSERVER_TRUE@LoadPlugin vserver
+@BUILD_MODULE_WIRELESS_TRUE@LoadPlugin wireless
 
 #<Plugin apache>
 #      URL http://localhost/status?auto
 #      User www-user
 #      Password secret
+#      CACert /etc/ssl/ca.crt
 #</Plugin>
 
-#<Plugin ping>
-#      Host host.foo.bar
+#<Plugin apcups>
+#      Host localhost
+#      Port 3551
+#</Plugin>
+
+#<Plugin hddtemp>
+#      Host 127.0.0.1
+#      Port 7634
+#</Plugin>
+
+#<Plugin ntpd>
+#      Host localhost
+#      Port 123
 #</Plugin>
 
 #<Plugin mysql>
 #      Host database.serv.er
 #      User db_user
 #      Password secret
-##     Database db_name
+#      Database db_name
+#</Plugin>
+
+#<Plugin ping>
+#      Host host.foo.bar
+#</Plugin>
+
+#<Plugin traffic>
+#      Interface eth0
+#      IgnoreSelected false
 #</Plugin>