Configuration: add _path suffix to IcingaApplication attributes "ca" and "cert"

refs #3222

diff --git a/docs/icinga2-config.txt b/docs/icinga2-config.txt
index 36d041b0a0c4b887da5813c990f3a7b259925da9..203fb5f0ac8375692377bd7d2dc1a3df855471fb 100644 (file)
--- a/docs/icinga2-config.txt
+++ b/docs/icinga2-config.txt
@@ -326,8 +326,8 @@ Example:
 
 -------------------------------------------------------------------------------
 local object IcingaApplication "icinga" {
-  cert = "my-cert.pem",
-  ca = "ca.crt",
+  cert_path = "my-cert.pem",
+  ca_path = "ca.crt",
 
   node = "192.168.0.1",
   service = 7777,
@@ -342,15 +342,15 @@ local object IcingaApplication "icinga" {
 }
 -------------------------------------------------------------------------------
 
-Attribute: cert
-^^^^^^^^^^^^^^^
+Attribute: cert_path
+^^^^^^^^^^^^^^^^^^^^
 
 This is used to specify the SSL client certificate Icinga 2 will use when
 connecting to other Icinga 2 instances. This property is optional when you're
 setting up a non-networked Icinga 2 instance.
 
-Attribute: ca
-^^^^^^^^^^^^^
+Attribute: ca_path
+^^^^^^^^^^^^^^^^^^
 
 This is the public CA certificate that is used to verify connections from other
 Icinga 2 instances. This property is optional when you're setting up a

diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index 04218712178d7095d222fc91f9d8b054c38b6c60..bc616f856efd2c376cd869fe42f19d9c54940797 100644 (file)
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -90,8 +90,8 @@ int IcingaApplication::Main(const vector<String>& args)
                }
        }
 
-       m_CertificateFile = Get("cert");
-       m_CAFile = Get("ca");
+       m_CertificateFile = Get("cert_path");
+       m_CAFile = Get("ca_path");
        m_Node = Get("node");
        m_Service = Get("service");