me
/
guix
Archived
1
0
Fork 0
Code

services: admin: Export rottlog-configuration accessors. 

* gnu/services/admin.scm (<rottlog-configuration>): Rename accessors
rottlog-rottlog to rottlog-configuration-rottlog, rottlog-rc-file to
rottlog-configuration-rc-file, rottlog-rotations to
rottlog-configuration-rotations, rottlog-jobs to rottlog-configuration-jobs.
(rottlog-etc, rottlog-jobs-or-default, rottlog-service-type): Adjust
accordingly.
Simon Tournier 2023-10-18 16:53:44 +02:00
parent f3714b3d5f
commit 7e4324575c
No known key found for this signature in database
GPG Key ID: 92F1D22C608EE7E5
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/services/admin.scm
View File

@ -52,6 +52,10 @@
rottlog-configuration rottlog-configuration
rottlog-configuration? rottlog-configuration?
rottlog-configuration-rottlog
rottlog-configuration-rc-file
rottlog-configuration-rotations
rottlog-configuration-jobs
rottlog-service rottlog-service
rottlog-service-type rottlog-service-type
@ -193,25 +197,25 @@ for ROTATION."
(define-record-type* <rottlog-configuration> (define-record-type* <rottlog-configuration>
rottlog-configuration make-rottlog-configuration rottlog-configuration make-rottlog-configuration
rottlog-configuration? rottlog-configuration?
(rottlog rottlog-rottlog ;file-like (rottlog rottlog-configuration-rottlog ;file-like
(default rottlog)) (default rottlog))
(rc-file rottlog-rc-file ;file-like (rc-file rottlog-configuration-rc-file ;file-like
(default (file-append rottlog "/etc/rc"))) (default (file-append rottlog "/etc/rc")))
(rotations rottlog-rotations ;list of <log-rotation> (rotations rottlog-configuration-rotations ;list of <log-rotation>
(default %default-rotations)) (default %default-rotations))
(jobs rottlog-jobs ;list of <mcron-job> (jobs rottlog-configuration-jobs ;list of <mcron-job>
(default #f))) (default #f)))
(define (rottlog-etc config) (define (rottlog-etc config)
`(("rottlog" `(("rottlog"
,(file-union "rottlog" ,(file-union "rottlog"
(cons `("rc" ,(rottlog-rc-file config)) (cons `("rc" ,(rottlog-configuration-rc-file config))
(log-rotations->/etc-entries (log-rotations->/etc-entries
(rottlog-rotations config))))))) (rottlog-configuration-rotations config)))))))
(define (rottlog-jobs-or-default config) (define (rottlog-jobs-or-default config)
(or (rottlog-jobs config) (or (rottlog-configuration-jobs config)
(default-jobs (rottlog-rottlog config)))) (default-jobs (rottlog-configuration-rottlog config))))
(define rottlog-service-type (define rottlog-service-type
(service-type (service-type
@ -226,12 +230,12 @@ Old log files are removed or compressed according to the configuration.")
;; Add Rottlog to the global profile so users can access ;; Add Rottlog to the global profile so users can access
;; the documentation. ;; the documentation.
(service-extension profile-service-type (service-extension profile-service-type
(compose list rottlog-rottlog)))) (compose list rottlog-configuration-rottlog))))
(compose concatenate) (compose concatenate)
(extend (lambda (config rotations) (extend (lambda (config rotations)
(rottlog-configuration (rottlog-configuration
(inherit config) (inherit config)
(rotations (append (rottlog-rotations config) (rotations (append (rottlog-configuration-rotations config)
rotations))))) rotations)))))
(default-value (rottlog-configuration)))) (default-value (rottlog-configuration))))