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

Merge branch 'master' of github.com:gunnarbeutner/strawberry

This commit is contained in:
Gunnar Beutner 2012-05-15 11:08:33 +02:00
parent e2ce61e5a1 bcaff12d20
commit 2f6380c8f1
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
icinga-app/icinga-standalone.conf Normal file
View File

@ -0,0 +1,9 @@
{
"icinga": {
"icinga": {
}
},
"component": {
"demo": { }
}
}

3
icinga/endpointmanager.cpp
View File

@ -43,6 +43,9 @@ shared_ptr<SSL_CTX> EndpointManager::GetSSLContext(void) const
void EndpointManager::AddListener(string service) void EndpointManager::AddListener(string service)
{ {
if (!GetSSLContext())
throw InvalidArgumentException("SSL context is required for AddListener()");
stringstream s; stringstream s;
s << "Adding new listener: port " << service; s << "Adding new listener: port " << service;
Application::Log(s.str()); Application::Log(s.str());

11
icinga/icingaapplication.cpp
View File

@ -66,15 +66,7 @@ int IcingaApplication::Main(const vector<string>& args)
fileComponentConfig->SetPropertyInteger("replicate", 0); fileComponentConfig->SetPropertyInteger("replicate", 0);
GetConfigHive()->AddObject(fileComponentConfig); GetConfigHive()->AddObject(fileComponentConfig);
if (GetPrivateKeyFile().empty()) if (!GetPrivateKeyFile().empty() && !GetPublicKeyFile().empty() && !GetCAKeyFile().empty()) {
throw InvalidArgumentException("No private key was specified.");
if (GetPublicKeyFile().empty())
throw InvalidArgumentException("No public certificate was specified.");
if (GetCAKeyFile().empty())
throw InvalidArgumentException("No CA certificate was specified.");
/* set up SSL context */ /* set up SSL context */
shared_ptr<X509> cert = Utility::GetX509Certificate(GetPublicKeyFile()); shared_ptr<X509> cert = Utility::GetX509Certificate(GetPublicKeyFile());
string identity = Utility::GetCertificateCN(cert); string identity = Utility::GetCertificateCN(cert);
@ -83,6 +75,7 @@ int IcingaApplication::Main(const vector<string>& args)
shared_ptr<SSL_CTX> sslContext = Utility::MakeSSLContext(GetPublicKeyFile(), GetPrivateKeyFile(), GetCAKeyFile()); shared_ptr<SSL_CTX> sslContext = Utility::MakeSSLContext(GetPublicKeyFile(), GetPrivateKeyFile(), GetCAKeyFile());
m_EndpointManager->SetSSLContext(sslContext); m_EndpointManager->SetSSLContext(sslContext);
}
/* create the primary RPC listener */ /* create the primary RPC listener */
string service = GetService(); string service = GetService();