Move the base command templates into libmethods

fixes #8775

diff --git a/itl/CMakeLists.txt b/itl/CMakeLists.txt
index d1d1e19277227fa076830ccbce3dfe57327ffe35..60aa69b6bdf101f8f732d4aee2ffc434a1796f32 100644 (file)
--- a/itl/CMakeLists.txt
+++ b/itl/CMakeLists.txt
@@ -18,6 +18,6 @@
 add_subdirectory(plugins-contrib.d)
 
 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
 )

diff --git a/itl/itl b/itl/itl
index 19108b175cced1ab7c8aa639e5491679f1ed8487..9362e24099c1cb4b1d789cbe55afd12059967a0a 100644 (file)
--- a/itl/itl
+++ b/itl/itl
@@ -22,6 +22,7 @@
  * configuration templates.
  */
 
-include "command.conf"
+library "methods"
+
 include "command-icinga.conf"
 include "timeperiod.conf"

diff --git a/lib/db_ido/CMakeLists.txt b/lib/db_ido/CMakeLists.txt
index 49d3e114d9cda591889eb0fd9b277fca5f22bb03..fcc74ea60c9b3a2e8339de295e4c156c0b3773a9 100644 (file)
--- a/lib/db_ido/CMakeLists.txt
+++ b/lib/db_ido/CMakeLists.txt
@@ -18,11 +18,11 @@
 mkclass_target(dbconnection.ti dbconnection.thpp)
 
 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
   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
   hostgroupdbobject.cpp idochecktask.cpp servicedbobject.cpp
   servicegroupdbobject.cpp timeperioddbobject.cpp userdbobject.cpp

diff --git a/lib/db_ido/db_ido-check.conf b/lib/db_ido/db_ido-itl.conf
similarity index 100%
rename from lib/db_ido/db_ido-check.conf
rename to lib/db_ido/db_ido-itl.conf

diff --git a/lib/methods/CMakeLists.txt b/lib/methods/CMakeLists.txt
index c85468978606d28844f1a2357d959c55608186c5..345c0f6437c49897afcccd4e494f7f5934acbc3d 100644 (file)
--- a/lib/methods/CMakeLists.txt
+++ b/lib/methods/CMakeLists.txt
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
+mkembedconfig_target(methods-itl.conf methods-itl.cpp)
+
 if(MSVC)
   set(WindowsSources clrchecktask.cpp)
 else()
@@ -23,7 +25,7 @@ endif()
 
 set(methods_SOURCES
   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
   randomchecktask.cpp timeperiodtask.cpp ${WindowsSources}
 )

diff --git a/itl/command.conf b/lib/methods/methods-itl.conf
similarity index 99%
rename from itl/command.conf
rename to lib/methods/methods-itl.conf
index f29e354c922ec095fc46c1aef8d2e939d7966a64..b7e1dd9b58bb71f6024d0bf3a247ab587c12778d 100644 (file)
--- a/itl/command.conf
+++ b/lib/methods/methods-itl.conf
@@ -17,8 +17,6 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-library "methods"
-
 template CheckCommand "icinga-check-command" {
        execute = IcingaCheck
 }