diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-08-27 19:22:04 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-08-30 03:41:42 +0200 |
| commit | 70186c24eee7603e1763143ba97ab6abea63f10c (patch) | |
| tree | f7bb9beb7bb4a230607c15450450bda22ab6fec2 | |
| parent | ee0de9945438cce41ef20e37144f41a8d40cd1ab (diff) | |
| download | guix-patches-70186c24eee7603e1763143ba97ab6abea63f10c.tar guix-patches-70186c24eee7603e1763143ba97ab6abea63f10c.tar.gz | |
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.
| -rw-r--r-- | doc/guix.texi | 12 | ||||
| -rw-r--r-- | gnu/services/cups.scm | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index ed74034dc6..32c98e23c6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14228,6 +14228,12 @@ programs. Defaults to @samp{"lp"}. @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 @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}. @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 Listens on the specified interfaces for encrypted connections. Valid values are of the form @var{address}:@var{port}, where @var{address} is diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index ace7889fb6..2105df6ded 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -458,7 +458,10 @@ or state files.") (user (string "lp") "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) #f) @@ -811,9 +814,6 @@ reports @code{CUPS 2.0}. @code{Minimal} reports @code{CUPS 2.0.0}. @code{OS} 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}) IPP/2.0}.") - (set-env - (string "variable value") - "Set the specified environment variable to be passed to child processes.") (ssl-listen (multiline-string-list '()) "Listens on the specified interfaces for encrypted connections. Valid |