summaryrefslogtreecommitdiff
path: root/doc/guix.texi
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-02-07 17:47:23 +0100
committerMarius Bakke <marius@gnu.org>2022-02-07 18:19:46 +0100
commit326e08bf0f55409f040612001f73a2cc4091c159 (patch)
tree014ed8acf60a74943fb201c12ca02a18e9579cbc /doc/guix.texi
parentfda218009b9d80e11bb886a2529e9dde90e88e9c (diff)
services: zabbix-front-end: Restore backwards compatibility.
Commit e301f1a8ed11f9eacb2b7f525a7446dc00621a8b removed the NGINX argument entirely, but users may rely on and override it. Reported by rekado on #guix. * gnu/services/monitoring.scm (%zabbix-front-end-nginx-configuration): Restore exported variable. (zabbix-front-end-nginx-extension): New procedure. (zabbix-front-end-configuration): Remove FASTCGI-PARAMS field. Restore NGINX field, but default to the empty list. (zabbix-front-end-service-type): Extend NGINX-SERVICE-TYPE by ZABBIX-FRONT-END-NGINX-EXTENSION. * doc/guix.texi (Monitoring Services): Regenerate documentation.
Diffstat (limited to 'doc/guix.texi')
-rw-r--r--doc/guix.texi19
1 files changed, 10 insertions, 9 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 9d3548aac7..2a9ef75dfd 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25804,31 +25804,32 @@ Available @code{zabbix-front-end-configuration} fields are:
@item @code{zabbix-server} (default: @code{zabbix-server}) (type: file-like)
The Zabbix server package to use.
-@item @code{fastcgi-params} (type: list)
-List of FastCGI parameter pairs that will be included in the NGINX
-configuration.
+@item @code{nginx} (default: @code{()}) (type: list)
+List of @pxref{NGINX,@code{nginx-server-configuration}} blocks for the
+Zabbix front-end. When empty, a default that listens on port 80 is
+used.
-@item @code{db-host} (default: @code{\"localhost\"}) (type: string)
+@item @code{db-host} (default: @code{"localhost"}) (type: string)
Database host name.
@item @code{db-port} (default: @code{5432}) (type: number)
Database port.
-@item @code{db-name} (default: @code{\"zabbix\"}) (type: string)
+@item @code{db-name} (default: @code{"zabbix"}) (type: string)
Database name.
-@item @code{db-user} (default: @code{\"zabbix\"}) (type: string)
+@item @code{db-user} (default: @code{"zabbix"}) (type: string)
Database user.
-@item @code{db-password} (default: @code{\"\"}) (type: string)
+@item @code{db-password} (default: @code{""}) (type: string)
Database password. Please, use @code{db-secret-file} instead.
-@item @code{db-secret-file} (default: @code{\"\"}) (type: string)
+@item @code{db-secret-file} (default: @code{""}) (type: string)
Secret file which will be appended to @file{zabbix.conf.php} file. This
file contains credentials for use by Zabbix front-end. You are expected
to create it manually.
-@item @code{zabbix-host} (default: @code{\"localhost\"}) (type: string)
+@item @code{zabbix-host} (default: @code{"localhost"}) (type: string)
Zabbix server hostname.
@item @code{zabbix-port} (default: @code{10051}) (type: number)