From 008a0f87c3f5278ab256630e5dbe772a2771a6ab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Jan 2022 09:26:55 +0100 Subject: gnu: zabbix-server: Adjust style. * gnu/packages/monitoring.scm (zabbix-server)[arguments]: Rewrite as gexp, use #:phases matching, and remove trailing #t's. --- gnu/packages/monitoring.scm | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'gnu/packages/monitoring.scm') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index e9d2934ca1..14e9ffc459 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Lars-Dominik Braun -;;; Copyright © 2021 Marius Bakke +;;; Copyright © 2021, 2022 Marius Bakke ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 Raphaël Mélotte ;;; @@ -196,10 +196,10 @@ (define-public zabbix-server (name "zabbix-server") (outputs '("out" "front-end" "schema")) (arguments - (substitute-keyword-arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-front-end + (substitute-keyword-arguments (package-arguments zabbix-agentd) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'install 'install-front-end (lambda* (#:key outputs #:allow-other-keys) (let* ((php (string-append (assoc-ref outputs "front-end") "/share/zabbix/php")) @@ -207,11 +207,10 @@ (define-public zabbix-server (etc (string-append php "/etc"))) (mkdir-p php) (copy-recursively "ui" php) - ;; Make front-end write config to ‘/etc/zabbix’ directory. + ;; Make front-end read config from ‘/etc/zabbix’ directory. (rename-file front-end-conf (string-append front-end-conf "-example")) - (symlink "/etc/zabbix" front-end-conf)) - #t)) + (symlink "/etc/zabbix" front-end-conf)))) (add-after 'install 'install-schema (lambda* (#:key outputs #:allow-other-keys) (let ((database-directory @@ -220,21 +219,19 @@ (define-public zabbix-server (for-each delete-file (find-files "database" "Makefile\\.in|\\.am$")) (mkdir-p database-directory) - (copy-recursively "database" database-directory)) - #t))) - ,@(package-arguments zabbix-agentd)) - ((#:configure-flags flags) - `(cons* "--enable-server" - "--with-postgresql" - (string-append "--with-libevent=" - (assoc-ref %build-inputs "libevent")) - "--with-net-snmp" - (string-append "--with-gnutls=" - (assoc-ref %build-inputs "gnutls")) - "--with-libcurl" - (string-append "--with-zlib=" - (assoc-ref %build-inputs "zlib")) - ,flags)))) + (copy-recursively "database" database-directory)))))) + ((#:configure-flags flags ''()) + #~(append (list "--enable-server" + "--with-postgresql" + (string-append "--with-libevent=" + (assoc-ref %build-inputs "libevent")) + "--with-net-snmp" + (string-append "--with-gnutls=" + (assoc-ref %build-inputs "gnutls")) + "--with-libcurl" + (string-append "--with-zlib=" + (assoc-ref %build-inputs "zlib"))) + #$flags)))) (inputs (modify-inputs (package-inputs zabbix-agentd) (prepend curl -- cgit v1.2.3 From ed04a61e0bb003bdcaa4240ca7816b8e471a8785 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Jan 2022 09:27:19 +0100 Subject: gnu: zabbix-server: Don't install agent. * gnu/packages/monitoring.scm (zabbix-server)[arguments]: Delete "--enable-agent" from #:configure-flags. --- gnu/packages/monitoring.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/monitoring.scm') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 14e9ffc459..d1aa2cba7c 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -231,7 +231,7 @@ (define-public zabbix-server "--with-libcurl" (string-append "--with-zlib=" (assoc-ref %build-inputs "zlib"))) - #$flags)))) + (delete "--enable-agent" #$flags))))) (inputs (modify-inputs (package-inputs zabbix-agentd) (prepend curl -- cgit v1.2.3 From 440ad14128f27d511f3b8ec4cce964b94304e4dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Jan 2022 09:27:59 +0100 Subject: gnu: zabbix-server: Remove duplicate input. * gnu/packages/monitoring.scm (zabbix-server)[inputs]: Remove CURL. --- gnu/packages/monitoring.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/monitoring.scm') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index d1aa2cba7c..008fccf893 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -237,10 +237,9 @@ (define-public zabbix-server (prepend curl libevent gnutls - postgresql - zlib net-snmp - curl))) + postgresql + zlib))) (synopsis "Distributed monitoring solution (server-side)") (description "This package provides a distributed monitoring solution (server-side)"))) -- cgit v1.2.3 From 0d347fe83eabc0786590fe0a60646c5824bfad2b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 28 Jan 2022 11:14:57 +0100 Subject: gnu: zabbix-server: Use a sensible default for the "fping" executable. * gnu/packages/monitoring.scm (zabbix-agentd)[source](modules, snippet): New fields. --- gnu/packages/monitoring.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/monitoring.scm') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 008fccf893..d9f84e87e4 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -172,7 +172,14 @@ (define-public zabbix-agentd "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 - (base32 "100n1rv7r4pqagxxifzpcza5bhrr2fklzx7gndxwiyq4597p1jvn")))) + (base32 "100n1rv7r4pqagxxifzpcza5bhrr2fklzx7gndxwiyq4597p1jvn")) + (modules '((guix build utils))) + (snippet + '(substitute* '("src/zabbix_proxy/proxy.c" + "src/zabbix_server/server.c") + ;; 'fping' must be setuid, so look for it in the usual location. + (("/usr/sbin/fping[[:digit:]]?") + "/run/setuid-programs/fping"))))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 45681b89a88a050ce2f3a3b9f9974eafe1b4302c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jan 2022 12:34:25 +0100 Subject: gnu: zabbix: Update to 5.4.9. * gnu/packages/monitoring.scm (zabbix-agentd): Update to 5.4.9. --- gnu/packages/monitoring.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/monitoring.scm') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index d9f84e87e4..64ebb96b87 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -164,7 +164,7 @@ (define-public nagios (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "5.2.6") + (version "5.4.9") (source (origin (method url-fetch) @@ -172,7 +172,7 @@ (define-public zabbix-agentd "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 - (base32 "100n1rv7r4pqagxxifzpcza5bhrr2fklzx7gndxwiyq4597p1jvn")) + (base32 "0hf9qygjy4vyknsin6qmgpna6z4c4mdrglifgkpxbs3nvwl6cs0r")) (modules '((guix build utils))) (snippet '(substitute* '("src/zabbix_proxy/proxy.c" -- cgit v1.2.3 From b8f280baecbc0381f6a4a5b3d6e9b28d3d3da2ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 13 Feb 2022 09:36:41 +0100 Subject: gnu: zabbix-agentd: Add release-monitoring-url. * gnu/packages/monitoring.scm (zabbix-agentd)[properties]: New field. --- gnu/packages/monitoring.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/monitoring.scm') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 64ebb96b87..a6d45fe597 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -195,7 +195,10 @@ (define-public zabbix-agentd (synopsis "Distributed monitoring solution (client-side agent)") (description "This package provides a distributed monitoring solution (client-side agent)") - (license license:gpl2))) + (license license:gpl2) + (properties + '((release-monitoring-url . "https://www.zabbix.com/download_sources") + (upstream-name . "zabbix"))))) (define-public zabbix-server (package -- cgit v1.2.3 From ae0ba592ba6f6cf19ebd70a2cd5074a31afa3d70 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 13 Feb 2022 09:37:43 +0100 Subject: gnu: zabbix-agentd: Use the correct license. * gnu/packages/monitoring.scm (zabbix-agentd)[license]: Change from GPL2 to GPL2+. --- gnu/packages/monitoring.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/monitoring.scm') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index a6d45fe597..6647d3bbc3 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -195,7 +195,7 @@ (define-public zabbix-agentd (synopsis "Distributed monitoring solution (client-side agent)") (description "This package provides a distributed monitoring solution (client-side agent)") - (license license:gpl2) + (license license:gpl2+) (properties '((release-monitoring-url . "https://www.zabbix.com/download_sources") (upstream-name . "zabbix"))))) -- cgit v1.2.3 From b1fb01e659d04bec54675616ed4b1502376cb6e7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 13 Feb 2022 09:39:05 +0100 Subject: gnu: Zabbix: Update to 5.4.10. * gnu/packages/monitoring.scm (zabbix-agentd): Update to 5.4.10. [source](snippet): Simplify fping substitution. --- gnu/packages/monitoring.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/monitoring.scm') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 6647d3bbc3..8c4012f004 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -164,7 +164,7 @@ (define-public nagios (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "5.4.9") + (version "5.4.10") (source (origin (method url-fetch) @@ -172,13 +172,13 @@ (define-public zabbix-agentd "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 - (base32 "0hf9qygjy4vyknsin6qmgpna6z4c4mdrglifgkpxbs3nvwl6cs0r")) + (base32 "0xwqwmq811fgxl6j9a9527i55jcpq98gqvwcda8la9gj0rsiqas6")) (modules '((guix build utils))) (snippet '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") ;; 'fping' must be setuid, so look for it in the usual location. - (("/usr/sbin/fping[[:digit:]]?") + (("/usr/sbin/fping6?") "/run/setuid-programs/fping"))))) (build-system gnu-build-system) (arguments -- cgit v1.2.3