mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
services: zabbix-front-end: Show location in messages.
* gnu/services/monitoring.scm (zabbix-front-end-config): Show location in messages.
This commit is contained in:
parent
d132d9f96b
commit
e44de1d2fb
1 changed files with 33 additions and 24 deletions
|
@ -1,7 +1,7 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
|
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
|
||||||
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
|
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
|
||||||
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
|
;;; Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -29,7 +29,8 @@ (define-module (gnu services monitoring)
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix gexp)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix records)
|
#:use-module (guix records)
|
||||||
#:use-module ((guix ui) #:select (display-hint))
|
#:use-module (guix utils)
|
||||||
|
#:use-module ((guix ui) #:select (display-hint G_))
|
||||||
#:use-module (ice-9 match)
|
#:use-module (ice-9 match)
|
||||||
#:use-module (ice-9 rdelim)
|
#:use-module (ice-9 rdelim)
|
||||||
#:use-module (srfi srfi-26)
|
#:use-module (srfi srfi-26)
|
||||||
|
@ -509,13 +510,12 @@ (define-configuration zabbix-front-end-configuration
|
||||||
(number 10051)
|
(number 10051)
|
||||||
"Zabbix server port."))
|
"Zabbix server port."))
|
||||||
|
|
||||||
(define zabbix-front-end-config
|
(define (zabbix-front-end-config config)
|
||||||
(match-lambda
|
(match-record config <zabbix-front-end-configuration>
|
||||||
(($ <zabbix-front-end-configuration>
|
(%location db-host db-port db-name db-user db-password db-secret-file
|
||||||
_ db-host db-port db-name db-user db-password db-secret-file
|
zabbix-host zabbix-port)
|
||||||
zabbix-host zabbix-port)
|
(mixed-text-file "zabbix.conf.php"
|
||||||
(mixed-text-file "zabbix.conf.php"
|
"\
|
||||||
"\
|
|
||||||
<?php
|
<?php
|
||||||
// Zabbix GUI configuration file.
|
// Zabbix GUI configuration file.
|
||||||
global $DB;
|
global $DB;
|
||||||
|
@ -525,20 +525,29 @@ (define zabbix-front-end-config
|
||||||
$DB['PORT'] = '" (number->string db-port) "';
|
$DB['PORT'] = '" (number->string db-port) "';
|
||||||
$DB['DATABASE'] = '" db-name "';
|
$DB['DATABASE'] = '" db-name "';
|
||||||
$DB['USER'] = '" db-user "';
|
$DB['USER'] = '" db-user "';
|
||||||
$DB['PASSWORD'] = '" (if (string-null? db-password)
|
$DB['PASSWORD'] = '" (let ((file (location-file %location))
|
||||||
(if (string-null? db-secret-file)
|
(line (location-line %location))
|
||||||
(raise (condition
|
(column (location-column %location)))
|
||||||
(&message
|
(if (string-null? db-password)
|
||||||
(message "\
|
(if (string-null? db-secret-file)
|
||||||
you must provide either 'db-secret-file' or 'db-password'"))))
|
(raise (make-compound-condition
|
||||||
(string-trim-both
|
(condition
|
||||||
(with-input-from-file db-secret-file
|
(&message
|
||||||
read-string)))
|
(message
|
||||||
(begin
|
(format #f "no '~A' or '~A' field in your '~A' record"
|
||||||
(display-hint "\
|
'db-secret-file 'db-password
|
||||||
Consider using @code{db-secret-file} instead of @code{db-password} and unset
|
'zabbix-front-end-configuration))))
|
||||||
@code{db-password} for security in @code{zabbix-front-end-configuration}.")
|
(condition
|
||||||
db-password)) "';
|
(&error-location
|
||||||
|
(location %location)))))
|
||||||
|
(string-trim-both
|
||||||
|
(with-input-from-file db-secret-file
|
||||||
|
read-string)))
|
||||||
|
(begin
|
||||||
|
(display-hint (format #f (G_ "~a:~a:~a: ~a:
|
||||||
|
Consider using @code{db-secret-file} instead of @code{db-password} for better
|
||||||
|
security.") file line column 'zabbix-front-end-configuration))
|
||||||
|
db-password))) "';
|
||||||
|
|
||||||
// Schema name. Used for IBM DB2 and PostgreSQL.
|
// Schema name. Used for IBM DB2 and PostgreSQL.
|
||||||
$DB['SCHEMA'] = '';
|
$DB['SCHEMA'] = '';
|
||||||
|
@ -548,7 +557,7 @@ (define zabbix-front-end-config
|
||||||
$ZBX_SERVER_NAME = '';
|
$ZBX_SERVER_NAME = '';
|
||||||
|
|
||||||
$IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG;
|
$IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG;
|
||||||
"))))
|
")))
|
||||||
|
|
||||||
(define %maintenance.inc.php
|
(define %maintenance.inc.php
|
||||||
;; Empty php file to allow us move zabbix-frontend configs to ‘/etc/zabbix’
|
;; Empty php file to allow us move zabbix-frontend configs to ‘/etc/zabbix’
|
||||||
|
|
Loading…
Reference in a new issue