ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: zabbix: Don't write user to configuration file.

Browse source 
The service already runs with the specified user and group, so there is no use
in writing it to the configuration files.  This change is mainly done for
compatibility with 'zabbix-agent2' which does not understand the User=
setting, but also to document the correct data type for the "group" setting.

* gnu/services/monitoring.scm (serialize-string): Filter USER and GROUP
fields.
(group?, serialize-group): Remove variables.
(zabbix-server-configuration, zabbix-agent-configuration): Document the GROUP
field as 'string'.
* doc/guix.texi (Monitoring Services): Adjust accordingly.
This commit is contained in:
Marius Bakke 2022-12-07 18:40:42 +01:00
parent 3e0070360f
commit 10251c4456
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/guix.texi
View file

@ -28126,7 +28126,7 @@ The zabbix-server package.
@item @code{user} (default: @code{"zabbix"}) (type: string)
User who will run the Zabbix server.
@item @code{group} (default: @code{"zabbix"}) (type: group)
@item @code{group} (default: @code{"zabbix"}) (type: string)
Group who will run the Zabbix server.
@item @code{db-host} (default: @code{"127.0.0.1"}) (type: string)
@ -28212,7 +28212,7 @@ The zabbix-agent package.
@item @code{user} (default: @code{"zabbix"}) (type: string)
User who will run the Zabbix agent.
@item @code{group} (default: @code{"zabbix"}) (type: group)
@item @code{group} (default: @code{"zabbix"}) (type: string)
Group who will run the Zabbix agent.
@item @code{hostname} (default: @code{""}) (type: string)

15
gnu/services/monitoring.scm
View file

@ -224,15 +224,12 @@ (define (serialize-list field-name val)
(define (serialize-string field-name val)
(if (and (string? val) (string=? val ""))
(if (or (eq? 'user field-name)
(eq? 'group field-name)
(and (string? val) (string=? val "")))
""
(serialize-field field-name val)))
(define group? string?)
(define serialize-group
(const ""))
(define include-files? list?)
(define (serialize-include-files field-name val)
@ -256,8 +253,8 @@ (define-configuration zabbix-server-configuration
(user
(string "zabbix")
"User who will run the Zabbix server.")
(group ;for zabbix-server-account procedure
(group "zabbix")
(group
(string "zabbix")
"Group who will run the Zabbix server.")
(db-host
(string "127.0.0.1")
@ -438,7 +435,7 @@ (define-configuration zabbix-agent-configuration
(string "zabbix")
"User who will run the Zabbix agent.")
(group
(group "zabbix")
(string "zabbix")
"Group who will run the Zabbix agent.")
(hostname
(string "")