Merge branch 'install-config'

diff --git a/Makefile.am b/Makefile.am
index 7dda784..dee72e7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,5 @@ dist-hook:
        find $(distdir) -type d -name '.svn' | xargs rm -rf
 
 install-exec-hook:
-       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)

diff --git a/configure.in b/configure.in
index a1dbca6..ce5899d 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/contrib/collectd.conf b/contrib/collectd.conf
deleted file mode 100644 (file)
index bfeef92..0000000
--- a/contrib/collectd.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Config file for collectd(1).
-# Please read collectd.conf(5) for a list of options.
-# http://collectd.org/
-#
-
-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
-
-#<Plugin apache>
-#      URL http://localhost/status?auto
-#      User www-user
-#      Password secret
-#</Plugin>
-
-#<Plugin ping>
-#      Host host.foo.bar
-#</Plugin>
-
-#<Plugin mysql>
-#      Host database.serv.er
-#      User db_user
-#      Password secret
-##     Database db_name
-#</Plugin>

diff --git a/src/Makefile.am b/src/Makefile.am
index c868f5e..46d1a69 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -374,13 +374,22 @@ collectd_LDADD += "-dlopen" wireless.la
 collectd_DEPENDENCIES += wireless.la
 endif
 
-man_MANS = collectd.1 collectd.conf.5
+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) $< >$@
 
 .pod.5:
        pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< >$@
+
+install-exec-hook:
+       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+       if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
+       then \
+               $(INSTALL_DATA) collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
+       else \
+               $(INSTALL_DATA) collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
+       fi

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
new file mode 100644 (file)
index 0000000..2306b9f
--- /dev/null
+++ b/src/collectd.conf.in
@@ -0,0 +1,78 @@
+#
+# Config file for collectd(1).
+# Please read collectd.conf(5) for a list of options.
+# http://collectd.org/
+#
+
+# Select one of the following modes:
+@BUILD_WITH_RRDTOOL_TRUE@Mode Local
+#Mode Server
+@BUILD_WITH_RRDTOOL_FALSE@Mode Client
+#Mode Log
+
+#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 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
+#</Plugin>
+
+#<Plugin ping>
+#      Host host.foo.bar
+#</Plugin>
+
+#<Plugin traffic>
+#      Interface eth0
+#      IgnoreSelected false
+#</Plugin>