tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

refs #3222
This commit is contained in:
Michael Friedrich 2012-10-02 15:04:17 +02:00
parent c2bad406ef
commit bb50720843
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/icinga2-config.txt
View File

@ -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

4
lib/icinga/icingaapplication.cpp
View File

@ -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");