services: cups: Move SET-ENV to FILES-CONFIGURATION.

* gnu/services/cups.scm (cups-configuration): Move SET-ENV from here…
(files-configuration): …to here.
* doc/guix.texi (Printing Services): Adjust accordingly.
This commit is contained in:
Tobias Geerinckx-Rice 2019-08-27 19:22:04 +02:00
parent ee0de99454
commit 70186c24ee
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
2 changed files with 10 additions and 10 deletions

View file

@ -14228,6 +14228,12 @@ programs.
Defaults to @samp{"lp"}. Defaults to @samp{"lp"}.
@end deftypevr @end deftypevr
@deftypevr {@code{files-configuration} parameter} string set-env
Set the specified environment variable to be passed to child processes.
Defaults to @samp{"variable value"}.
@end deftypevr
@end deftypevr @end deftypevr
@deftypevr {@code{cups-configuration} parameter} access-log-level access-log-level @deftypevr {@code{cups-configuration} parameter} access-log-level access-log-level
@ -14755,12 +14761,6 @@ the output of the @code{uname} command. @code{Full} reports @code{CUPS
Defaults to @samp{Minimal}. Defaults to @samp{Minimal}.
@end deftypevr @end deftypevr
@deftypevr {@code{cups-configuration} parameter} string set-env
Set the specified environment variable to be passed to child processes.
Defaults to @samp{"variable value"}.
@end deftypevr
@deftypevr {@code{cups-configuration} parameter} multiline-string-list ssl-listen @deftypevr {@code{cups-configuration} parameter} multiline-string-list ssl-listen
Listens on the specified interfaces for encrypted connections. Valid Listens on the specified interfaces for encrypted connections. Valid
values are of the form @var{address}:@var{port}, where @var{address} is values are of the form @var{address}:@var{port}, where @var{address} is

View file

@ -458,7 +458,10 @@ (define-configuration files-configuration
(user (user
(string "lp") (string "lp")
"Specifies the user name or ID that is used when running external "Specifies the user name or ID that is used when running external
programs.")) programs.")
(set-env
(string "variable value")
"Set the specified environment variable to be passed to child processes."))
(define (serialize-files-configuration field-name val) (define (serialize-files-configuration field-name val)
#f) #f)
@ -811,9 +814,6 @@ (define-configuration cups-configuration
reports @code{CUPS 2.0.0 (@var{uname})} where @var{uname} is the output of the reports @code{CUPS 2.0.0 (@var{uname})} where @var{uname} is the output of the
@code{uname} command. @code{Full} reports @code{CUPS 2.0.0 (@var{uname}) @code{uname} command. @code{Full} reports @code{CUPS 2.0.0 (@var{uname})
IPP/2.0}.") IPP/2.0}.")
(set-env
(string "variable value")
"Set the specified environment variable to be passed to child processes.")
(ssl-listen (ssl-listen
(multiline-string-list '()) (multiline-string-list '())
"Listens on the specified interfaces for encrypted connections. Valid "Listens on the specified interfaces for encrypted connections. Valid