pyrox.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
lol
fork
Configure Feed
Select the types of activity you want to include in your feed.
icinga2: 2.14.3 -> 2.14.5
+25
-21
+2
-2
pkgs/servers/monitoring/icinga2/default.nix
+2
-2
pkgs/servers/monitoring/icinga2/default.nix
···
30
30
31
31
stdenv.mkDerivation rec {
32
32
pname = "icinga2${nameSuffix}";
33
-
version = "2.14.3";
33
+
version = "2.14.5";
34
34
35
35
src = fetchFromGitHub {
36
36
owner = "icinga";
37
37
repo = "icinga2";
38
38
rev = "v${version}";
39
-
hash = "sha256-QXe/+yQlyyOa78eEiudDni08SCUP3nhTYVpbmVUVKA8=";
39
+
hash = "sha256-5FQIcOvuq1GHX80rYuZ3jCM3CF9Fq1149nvlO1njqfA=";
40
40
};
41
41
42
42
patches = [
+23
-19
pkgs/servers/monitoring/icinga2/no-var-directories.patch
+23
-19
pkgs/servers/monitoring/icinga2/no-var-directories.patch
···
1
1
diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt
2
-
index 87993df..819c87b 100644
2
+
index 1c92d8331..e77199959 100644
3
3
--- a/icinga-app/CMakeLists.txt
4
4
+++ b/icinga-app/CMakeLists.txt
5
-
@@ -106,7 +106,3 @@ install(
5
+
@@ -94,9 +94,3 @@ install(
6
6
TARGETS icinga-app
7
7
RUNTIME DESTINATION ${InstallPath}
8
8
)
9
9
-
10
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")")
11
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")")
12
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")")
10
+
-if(NOT WIN32)
11
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")")
12
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")")
13
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")")
14
+
-endif()
13
15
diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt
14
-
index 5dda179..22cf69f 100644
16
+
index 986050017..39711c79e 100644
15
17
--- a/lib/base/CMakeLists.txt
16
18
+++ b/lib/base/CMakeLists.txt
17
-
@@ -125,7 +125,4 @@ set_target_properties (
19
+
@@ -154,9 +154,4 @@ set_target_properties (
18
20
FOLDER Lib
19
21
)
20
22
21
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")")
22
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")")
23
+
-if(NOT WIN32)
24
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")")
25
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")")
26
+
-endif()
23
27
-
24
28
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)
25
29
diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt
···
35
39
-
36
40
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)
37
41
diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt
38
-
index 65113d2..5e4398f 100644
42
+
index 2271abff6..fc03b5c6b 100644
39
43
--- a/lib/remote/CMakeLists.txt
40
44
+++ b/lib/remote/CMakeLists.txt
41
-
@@ -55,12 +55,3 @@ set_target_properties (
45
+
@@ -57,12 +57,3 @@ set_target_properties (
42
46
remote PROPERTIES
43
47
FOLDER Lib
44
48
)
45
49
-
46
-
-#install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")")
47
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")")
48
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")")
49
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")")
50
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")")
51
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")")
52
-
-
53
-
-
50
+
-if(NOT WIN32)
51
+
- #install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")")
52
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")")
53
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")")
54
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")")
55
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")")
56
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")")
57
+
-endif()
54
58
diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt
55
59
index 1438626..d882ae2 100644
56
60
--- a/lib/compat/CMakeLists.txt