Commit 44c86d0e authored by Alexander A. Klimov's avatar Alexander A. Klimov
Browse files

icinga2: 2.14.3 -> 2.14.5

parent 53878a43

pkgs/servers/monitoring/icinga2/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ 


stdenv.mkDerivation rec {

  pname = "icinga2${nameSuffix}";

  version = "2.14.3";

  version = "2.14.5";



  src = fetchFromGitHub {

    owner = "icinga";

    repo = "icinga2";

    rev = "v${version}";

    hash = "sha256-QXe/+yQlyyOa78eEiudDni08SCUP3nhTYVpbmVUVKA8=";

    hash = "sha256-5FQIcOvuq1GHX80rYuZ3jCM3CF9Fq1149nvlO1njqfA=";

  };



  patches = [

pkgs/servers/monitoring/icinga2/no-var-directories.patch

+23 −19
Original line number Diff line number Diff line 
diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt

index 87993df..819c87b 100644

index 1c92d8331..e77199959 100644

--- a/icinga-app/CMakeLists.txt

+++ b/icinga-app/CMakeLists.txt

@@ -106,7 +106,3 @@ install(

@@ -94,9 +94,3 @@ install(

   TARGETS icinga-app

   RUNTIME DESTINATION ${InstallPath}

 )

-

-if(NOT WIN32)

-  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")")

-  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")")

-  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")")

-endif()

diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt

index 5dda179..22cf69f 100644

index 986050017..39711c79e 100644

--- a/lib/base/CMakeLists.txt

+++ b/lib/base/CMakeLists.txt

@@ -125,7 +125,4 @@ set_target_properties (

@@ -154,9 +154,4 @@ set_target_properties (

   FOLDER Lib

 )

 

-if(NOT WIN32)

-  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")")

-  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")")

-endif()

-

 set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)

diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt
@@ -35,22 +39,22 @@ index ab963f7..3d9d506 100644 
-

 set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)

diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt

index 65113d2..5e4398f 100644

index 2271abff6..fc03b5c6b 100644

--- a/lib/remote/CMakeLists.txt

+++ b/lib/remote/CMakeLists.txt

@@ -55,12 +55,3 @@ set_target_properties (

@@ -57,12 +57,3 @@ set_target_properties (

   remote PROPERTIES

   FOLDER Lib

 )

-

-if(NOT WIN32)

-  #install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")")

-  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")")

-  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")")

-  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")")

-  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")")

-  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")")

-

-

-endif()

diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt

index 1438626..d882ae2 100644

--- a/lib/compat/CMakeLists.txt