From e58f85bb68b4c45130bb6fdf40b51db95d2b71e5 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sat, 1 May 2010 15:22:33 +0200 Subject: [PATCH] FQDNLookup: Enable this option by default. --- src/collectd.conf.in | 2 +- src/collectd.conf.pod | 9 ++------- src/configfile.c | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/collectd.conf.in b/src/collectd.conf.in index c564e1f9..bf1d7a46 100644 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@ -11,7 +11,7 @@ ############################################################################## #Hostname "localhost" -FQDNLookup true +#FQDNLookup true #BaseDir "@prefix@/var/lib/@PACKAGE_NAME@" #PIDFile "@prefix@/var/run/@PACKAGE_NAME@.pid" #PluginDir "@prefix@/lib/@PACKAGE_NAME@" diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index 773fc36c..9377686a 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@ -128,13 +128,8 @@ hostname will be determined using the L system call. If B is determined automatically this setting controls whether or not the daemon should try to figure out the "fully qualified domain name", FQDN. -This is done using a lookup of the name returned by C. - -Using this feature (i.Ee. setting this option to B) is recommended. -However, to preserve backwards compatibility the default is set to B. -The sample config file that is installed with Cinstall> includes a -line which sets this option, though, so that default installations will have -this setting enabled. +This is done using a lookup of the name returned by C. This option +is enabled by default. =item B I diff --git a/src/configfile.c b/src/configfile.c index 787ad0ea..afc3e479 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -96,7 +96,7 @@ static cf_global_option_t cf_global_options[] = {"BaseDir", NULL, PKGLOCALSTATEDIR}, {"PIDFile", NULL, PIDFILE}, {"Hostname", NULL, NULL}, - {"FQDNLookup", NULL, "false"}, + {"FQDNLookup", NULL, "true"}, {"Interval", NULL, "10"}, {"ReadThreads", NULL, "5"}, {"Timeout", NULL, "2"}, -- 2.11.0