X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=f0ac28713b1f30195df8e20683b314dec92402c9;hb=11011dc93691989513ff2101c221ea15dab5658a;hp=e3f2aa33505432fe405e996a17a75b6aa4c15fa2;hpb=37d3677e95febc653d8f67fc19f67eb4110910eb;p=collectd.git
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index e3f2aa33..f0ac2871 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -135,6 +135,7 @@
#@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java
@BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
#@BUILD_PLUGIN_LPAR_TRUE@LoadPlugin lpar
+#@BUILD_PLUGIN_LUA_TRUE@LoadPlugin lua
#@BUILD_PLUGIN_LVM_TRUE@LoadPlugin lvm
#@BUILD_PLUGIN_MADWIFI_TRUE@LoadPlugin madwifi
#@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon
@@ -574,12 +575,17 @@
#
#
-# WorkerThreads 5
+#
+# EnableSSL true
+# SSLCACertificateFile "/path/to/root.pem"
+# SSLCertificateFile "/path/to/server.pem"
+# SSLCertificateKeyFile "/path/to/server.key"
+#
#
# EnableSSL true
-# SSLRootCerts "/path/to/root.pem"
-# SSLServerCert "/path/to/server.pem"
-# SSLServerKey "/path/to/server.key"
+# SSLCACertificateFile "/path/to/root.pem"
+# SSLCertificateFile "/path/to/client.pem"
+# SSLCertificateKeyFile "/path/to/client.key"
#
#
@@ -635,6 +641,12 @@
# ReportBySerial false
#
+#
+# BasePath "@prefix@/share/@PACKAGE_NAME@/lua"
+# Script "script1.lua"
+# Script "script2.lua"
+#
+
#
# Interface "wlan0"
# IgnoreSelected false
@@ -738,6 +750,11 @@
# User "db_user"
# Password "secret"
# Database "db_name"
+# SSLKey "/path/to/key.pem"
+# SSLCert "/path/to/cert.pem"
+# SSLCA "/path/to/ca.pem"
+# SSLCAPath "/path/to/cas/"
+# SSLCipher "DHE-RSA-AES256-SHA"
# MasterStats true
# ConnectTimeout 10
# InnodbStats true
@@ -1391,6 +1408,7 @@
# StoreRates true
# AlwaysAppendDS false
# EscapeCharacter "_"
+# SeparateInstances false
#
#