From d873fe7b9b04d3f6257db5145bd1f778453850fc Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Fri, 12 Aug 2016 15:32:48 +0200 Subject: [PATCH] grpc plugin: Unify SSL config options. These option names have been copied from the Apache webserver. --- src/collectd.conf.in | 6 +++--- src/collectd.conf.pod | 6 +++--- src/grpc.cc | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/collectd.conf.in b/src/collectd.conf.in index e1e02a8a..15f4c395 100644 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@ -576,9 +576,9 @@ # # # 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/server.pem" +# SSLCertificateKeyFile "/path/to/server.key" # # # EnableSSL true diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index d8faba58..5be81564 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@ -2772,11 +2772,11 @@ supports the following options: Whether to enable SSL for incoming connections. Default: false. -=item B I +=item B I -=item B I +=item B I -=item B I +=item B I Filenames specifying SSL certificate and key material to be used with SSL connections. diff --git a/src/grpc.cc b/src/grpc.cc index 70c8e6c5..8b76954d 100644 --- a/src/grpc.cc +++ b/src/grpc.cc @@ -503,7 +503,7 @@ extern "C" { return -1; } } - else if (!strcasecmp("SSLRootCerts", child->key)) { + else if (!strcasecmp("SSLCACertificateFile", child->key)) { char *certs = NULL; if (cf_util_get_string(child, &certs)) { ERROR("grpc: Option `%s` expects a string value", @@ -512,7 +512,7 @@ extern "C" { } ssl_opts->pem_root_certs = read_file(certs); } - else if (!strcasecmp("SSLServerKey", child->key)) { + else if (!strcasecmp("SSLCertificateKeyFile", child->key)) { char *key = NULL; if (cf_util_get_string(child, &key)) { ERROR("grpc: Option `%s` expects a string value", @@ -521,7 +521,7 @@ extern "C" { } pkcp.private_key = read_file(key); } - else if (!strcasecmp("SSLServerCert", child->key)) { + else if (!strcasecmp("SSLCertificateFile", child->key)) { char *cert = NULL; if (cf_util_get_string(child, &cert)) { ERROR("grpc: Option `%s` expects a string value", -- 2.11.0