tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-06-27 17:04:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into compatido

Browse Source
This commit is contained in:
Michael Friedrich 2012-09-15 13:23:51 +02:00
commit 3db96f01ce
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -77,7 +77,6 @@ components/demo/Makefile
components/replication/Makefile components/replication/Makefile
docs/Doxyfile docs/Doxyfile
icinga-app/Makefile icinga-app/Makefile
icinga-app/config/Makefile
lib/Makefile lib/Makefile
lib/base/Makefile lib/base/Makefile
lib/config/Makefile lib/config/Makefile

3
icinga-app/Makefile.am
View File

@ -1,8 +1,5 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS = \
config
bin_PROGRAMS = \ bin_PROGRAMS = \
icinga icinga

14
lib/icinga/icingaapplication.cpp
View File

@ -34,13 +34,13 @@ const String IcingaApplication::DefaultStatePath = "icinga.state";
IcingaApplication::IcingaApplication(const Dictionary::Ptr& serializedUpdate) IcingaApplication::IcingaApplication(const Dictionary::Ptr& serializedUpdate)
: Application(serializedUpdate) : Application(serializedUpdate)
{ {
/* load cibsync config component */ /* load replication config component */
ConfigItemBuilder::Ptr cibsyncComponentConfig = boost::make_shared<ConfigItemBuilder>(); ConfigItemBuilder::Ptr replicationComponentConfig = boost::make_shared<ConfigItemBuilder>();
cibsyncComponentConfig->SetType("Component"); replicationComponentConfig->SetType("Component");
cibsyncComponentConfig->SetName("cibsync"); replicationComponentConfig->SetName("replication");
cibsyncComponentConfig->SetLocal(true); replicationComponentConfig->SetLocal(true);
cibsyncComponentConfig->Compile()->Commit(); replicationComponentConfig->Compile()->Commit();
cibsyncComponentConfig.reset(); replicationComponentConfig.reset();
/* load convenience config component */ /* load convenience config component */
ConfigItemBuilder::Ptr convenienceComponentConfig = boost::make_shared<ConfigItemBuilder>(); ConfigItemBuilder::Ptr convenienceComponentConfig = boost::make_shared<ConfigItemBuilder>();