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

Move the base command templates into libmethods

Browse Source 
fixes #8775
This commit is contained in:
Gunnar Beutner 2015-03-17 08:14:46 +01:00
parent 1eef0243c6
commit dae206e899
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
itl/CMakeLists.txt
View File

@ -18,6 +18,6 @@
add_subdirectory(plugins-contrib.d) add_subdirectory(plugins-contrib.d)
install( install(
FILES itl command.conf command-icinga.conf hangman timeperiod.conf plugins command-plugins.conf manubulon command-plugins-manubulon.conf command-nscp-local.conf nscp plugins-contrib FILES itl command-icinga.conf hangman timeperiod.conf plugins command-plugins.conf manubulon command-plugins-manubulon.conf command-nscp-local.conf nscp plugins-contrib
DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include
) )

3
itl/itl
View File

@ -22,6 +22,7 @@
* configuration templates. * configuration templates.
*/ */
include "command.conf" library "methods"
include "command-icinga.conf" include "command-icinga.conf"
include "timeperiod.conf" include "timeperiod.conf"

4
lib/db_ido/CMakeLists.txt
View File

@ -18,11 +18,11 @@
mkclass_target(dbconnection.ti dbconnection.thpp) mkclass_target(dbconnection.ti dbconnection.thpp)
mkembedconfig_target(db_ido-type.conf db_ido-type.cpp) mkembedconfig_target(db_ido-type.conf db_ido-type.cpp)
mkembedconfig_target(db_ido-check.conf db_ido-check.cpp) mkembedconfig_target(db_ido-itl.conf db_ido-itl.cpp)
set(db_ido_SOURCES set(db_ido_SOURCES
commanddbobject.cpp dbconnection.cpp dbconnection.thpp dbconnection.thpp commanddbobject.cpp dbconnection.cpp dbconnection.thpp dbconnection.thpp
db_ido-type.cpp db_ido-check.cpp dbevents.cpp dbobject.cpp dbquery.cpp db_ido-type.cpp db_ido-itl.cpp dbevents.cpp dbobject.cpp dbquery.cpp
dbreference.cpp dbtype.cpp dbvalue.cpp endpointdbobject.cpp hostdbobject.cpp dbreference.cpp dbtype.cpp dbvalue.cpp endpointdbobject.cpp hostdbobject.cpp
hostgroupdbobject.cpp idochecktask.cpp servicedbobject.cpp hostgroupdbobject.cpp idochecktask.cpp servicedbobject.cpp
servicegroupdbobject.cpp timeperioddbobject.cpp userdbobject.cpp servicegroupdbobject.cpp timeperioddbobject.cpp userdbobject.cpp

0
lib/db_ido/db_ido-check.conf → lib/db_ido/db_ido-itl.conf
View File

4
lib/methods/CMakeLists.txt
View File

@ -15,6 +15,8 @@
# along with this program; if not, write to the Free Software Foundation # along with this program; if not, write to the Free Software Foundation
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
mkembedconfig_target(methods-itl.conf methods-itl.cpp)
if(MSVC) if(MSVC)
set(WindowsSources clrchecktask.cpp) set(WindowsSources clrchecktask.cpp)
else() else()
@ -23,7 +25,7 @@ endif()
set(methods_SOURCES set(methods_SOURCES
clusterchecktask.cpp clusterzonechecktask.cpp clusterchecktask.cpp clusterzonechecktask.cpp
icingachecktask.cpp nullchecktask.cpp nulleventtask.cpp icingachecktask.cpp methods-itl.cpp nullchecktask.cpp nulleventtask.cpp
pluginchecktask.cpp plugineventtask.cpp pluginnotificationtask.cpp pluginchecktask.cpp plugineventtask.cpp pluginnotificationtask.cpp
randomchecktask.cpp timeperiodtask.cpp ${WindowsSources} randomchecktask.cpp timeperiodtask.cpp ${WindowsSources}
) )

2
itl/command.conf → lib/methods/methods-itl.conf
View File

@ -17,8 +17,6 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/ ******************************************************************************/
library "methods"
template CheckCommand "icinga-check-command" { template CheckCommand "icinga-check-command" {
execute = IcingaCheck execute = IcingaCheck
} }