summary refs log tree commit diff
path: root/gnu/services/cups.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/services/cups.scm')
-rw-r--r--gnu/services/cups.scm11
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm
index 8bcb450ddf..2e86845e51 100644
--- a/gnu/services/cups.scm
+++ b/gnu/services/cups.scm
@@ -419,6 +419,9 @@ queues.  The URI @url{file:///dev/null} is always allowed.")
    (string "lp")
    "Specifies the group name or ID that will be used when executing external
 programs.")
+  (log-file-group
+   (string "lpadmin")
+   "Specifies the group name or ID that will be used for log files.")
   (log-file-perm
    (string "0644")
    "Specifies the permissions for all log files that the scheduler writes.")
@@ -482,13 +485,13 @@ programs.")
     (serialize-space-separated-string-list field-name vars)))
 
 (define (package-list? val)
-  (and (list? val) (and-map package? val)))
+  (and (list? val) (and-map file-like? val)))
 (define (serialize-package-list field-name val)
   #f)
 
 (define-configuration cups-configuration
   (cups
-   (package cups)
+   (file-like cups)
    "The CUPS package.")
   (extensions
    (package-list (list brlaser cups-filters epson-inkjet-printer-escpr
@@ -702,7 +705,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 +850,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)