summary refs log tree commit diff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-11-16 01:04:54 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2021-11-16 01:15:04 +0100
commit122396075f12b013b6bde56dafb895587b95bc9d (patch)
tree6a0806b26e42886a74a0c5b7576b0f5dc1327828
parent58649b87470b3eaaa3c7f28656e125ae087b3186 (diff)
downloadguix-122396075f12b013b6bde56dafb895587b95bc9d.tar.gz
services: cups: Update default timeouts.
Upstream raised these back in 2019 with CUPS 2.3.0.

* gnu/services/cups.scm (<cups-configuration>): Raise default
‘multiple-operation-timeout’ and ‘timeout’ from 300 to 900 seconds.
* doc/guix.texi (Printing Services): Adjust accordingly.
-rw-r--r--doc/guix.texi4
-rw-r--r--gnu/services/cups.scm4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index debdb166e4..8fdeb9328d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19540,7 +19540,7 @@ Defaults to @samp{1048576}.
 Specifies the maximum amount of time to allow between files in a
 multiple file print job, in seconds.
 
-Defaults to @samp{300}.
+Defaults to @samp{900}.
 @end deftypevr
 
 @deftypevr {@code{cups-configuration} parameter} string page-log-format
@@ -19751,7 +19751,7 @@ Defaults to @samp{#f}.
 @deftypevr {@code{cups-configuration} parameter} non-negative-integer timeout
 Specifies the HTTP request timeout, in seconds.
 
-Defaults to @samp{300}.
+Defaults to @samp{900}.
 
 @end deftypevr
 
diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm
index 8bcb450ddf..1b8e19bed8 100644
--- a/gnu/services/cups.scm
+++ b/gnu/services/cups.scm
@@ -702,7 +702,7 @@ in seconds.  Set to 0 to disable cancellation of \"stuck\" jobs.")
    "Specifies the maximum size of the log files before they are rotated, in
 bytes.  The value 0 disables log rotation.")
   (multiple-operation-timeout
-   (non-negative-integer 300)
+   (non-negative-integer 900)
    "Specifies the maximum amount of time to allow between files in a multiple
 file print job, in seconds.")
   (page-log-format
@@ -847,7 +847,7 @@ protocol version to TLS v1.1.")
    "Specifies whether the scheduler requires clients to strictly adhere to the
 IPP specifications.")
   (timeout
-   (non-negative-integer 300)
+   (non-negative-integer 900)
    "Specifies the HTTP request timeout, in seconds.")
   (web-interface?
    (boolean #f)