diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-11-04 07:43:44 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-11-04 07:43:44 +0100 |
| commit | 72e886328c14c832b2ed71c400069b63852ee18d (patch) | |
| tree | 92b4f32df417af5cbb9433386d996ec7d17522e9 /gnu/services | |
| parent | 1c41971e721dde203580ec17899beae546f1133a (diff) | |
| parent | f54f36b363a86bb033275e3a0594974d3d91bd53 (diff) | |
| download | guix-72e886328c14c832b2ed71c400069b63852ee18d.tar guix-72e886328c14c832b2ed71c400069b63852ee18d.tar.gz | |
Merge branch 'master' into gnome-team
Change-Id: I88d3789460d1a89917451d80405d89a2824006ac
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/admin.scm | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index 5cf74c6e4d..0b325fddb1 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -52,6 +52,10 @@ rottlog-configuration rottlog-configuration? + rottlog-configuration-rottlog + rottlog-configuration-rc-file + rottlog-configuration-rotations + rottlog-configuration-jobs rottlog-service rottlog-service-type @@ -193,25 +197,25 @@ for ROTATION." (define-record-type* <rottlog-configuration> rottlog-configuration make-rottlog-configuration rottlog-configuration? - (rottlog rottlog-rottlog ;file-like + (rottlog rottlog-configuration-rottlog ;file-like (default rottlog)) - (rc-file rottlog-rc-file ;file-like + (rc-file rottlog-configuration-rc-file ;file-like (default (file-append rottlog "/etc/rc"))) - (rotations rottlog-rotations ;list of <log-rotation> + (rotations rottlog-configuration-rotations ;list of <log-rotation> (default %default-rotations)) - (jobs rottlog-jobs ;list of <mcron-job> + (jobs rottlog-configuration-jobs ;list of <mcron-job> (default #f))) (define (rottlog-etc config) `(("rottlog" ,(file-union "rottlog" - (cons `("rc" ,(rottlog-rc-file config)) + (cons `("rc" ,(rottlog-configuration-rc-file config)) (log-rotations->/etc-entries - (rottlog-rotations config))))))) + (rottlog-configuration-rotations config))))))) (define (rottlog-jobs-or-default config) - (or (rottlog-jobs config) - (default-jobs (rottlog-rottlog config)))) + (or (rottlog-configuration-jobs config) + (default-jobs (rottlog-configuration-rottlog config)))) (define rottlog-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 ;; the documentation. (service-extension profile-service-type - (compose list rottlog-rottlog)))) + (compose list rottlog-configuration-rottlog)))) (compose concatenate) (extend (lambda (config rotations) (rottlog-configuration (inherit config) - (rotations (append (rottlog-rotations config) + (rotations (append (rottlog-configuration-rotations config) rotations))))) (default-value (rottlog-configuration)))) |