grpc plugin: Unify SSL config options.

These option names have been copied from the Apache webserver.

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index e1e02a8a59f7643c697dcc3050747e7329e93383..15f4c3954e0213268d195d48e101b0bb2a4498b6 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -576,9 +576,9 @@
 #<Plugin grpc>
 #      <Server "example.com" "50051">
 #              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"
 #      </Server>
 #      <Listen "0.0.0.0" "50051">
 #              EnableSSL true

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index d8faba58dd278aa03b7f698e5f63c870697bbd39..5be815644a1c39fe88afe50aa7eee10d52aad06e 100644 (file)
--- 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<SSLRootCerts> I<Filename>
+=item B<SSLCACertificateFile> I<Filename>
 
-=item B<SSLServerKey> I<Filename>
+=item B<SSLCertificateFile> I<Filename>
 
-=item B<SSLServerCert> I<Filename>
+=item B<SSLCertificateKeyFile> I<Filename>
 
 Filenames specifying SSL certificate and key material to be used with SSL
 connections.

diff --git a/src/grpc.cc b/src/grpc.cc
index 70c8e6c5e0c988ce23928fe5c95b964d33d3ac75..8b76954d6748090a795d2eaf09fcfe7a8110f7c0 100644 (file)
--- 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",