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

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 10251c4456c4ec97a1f3604431241128f3e04729
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Dec 7 18:40:42 2022 +0100

    services: zabbix: Don't write user to configuration file.
    
    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.
---
 doc/guix.texi               |  4 ++--
 gnu/services/monitoring.scm | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index a79b777826..50487a5172 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -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)
diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm
index d6dc2c1e03..f12b7acb1f 100644
--- a/gnu/services/monitoring.scm
+++ b/gnu/services/monitoring.scm
@@ -224,15 +224,12 @@ Prometheus.")
 
 
 (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 @@ Prometheus.")
   (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 @@ results in a Web interface.")))
    (string "zabbix")
    "User who will run the Zabbix agent.")
   (group
-   (group "zabbix")
+   (string "zabbix")
    "Group who will run the Zabbix agent.")
   (hostname
    (string "")