From b538c1d7b95587d3f111a7bb610747e93c5f2468 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 25 Mar 2024 20:06:24 +0000
Subject: services: nar-herder: Add new configuration options.

* gnu/services/guix.scm (nar-herder-configuration-new-ttl,
nar-herder-cached-compression-configuration-unused-removal-duration,
nar-herder-cached-compression-configuration-ttl,
nar-herder-cached-compression-configuration-new-ttl): New procedure.
(nar-herder-shepherd-services): Handle the new options.
* doc/guix.texi (Guix Services): Document the new nar-herder options.

Change-Id: I161e490221a3ce394e32ada685dca27df60638bb
---
 gnu/services/guix.scm | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

(limited to 'gnu')

diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index c438da531c..8b326d9124 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -719,6 +719,8 @@ (define-record-type* <nar-herder-configuration>
    (default '()))
   (ttl           nar-herder-configuration-ttl
                  (default #f))
+  (new-ttl       nar-herder-configuration-new-ttl
+                 (default #f))
   (negative-ttl  nar-herder-configuration-negative-ttl
                  (default #f))
   (log-level     nar-herder-configuration-log-level
@@ -750,14 +752,22 @@ (define-record-type* <nar-herder-cached-compression-configuration>
                        (default #f))
   (directory-max-size
    nar-herder-cached-compression-configuration-directory-max-size
-   (default #f)))
+   (default #f))
+  (unused-removal-duration
+   nar-herder-cached-compression-configuration-unused-removal-duration
+   (default #f))
+  (ttl                 nar-herder-cached-compression-configuration-ttl
+                       (default #f))
+  (new-ttl             nar-herder-cached-compression-configuration-new-ttl
+                       (default #f)))
 
 (define (nar-herder-shepherd-services config)
   (define (cached-compression-configuration->options cached-compression)
     (match-record
         cached-compression
         <nar-herder-cached-compression-configuration>
-      (type level directory directory-max-size)
+        (type level directory directory-max-size
+              unused-removal-duration ttl new-ttl)
 
       `(,(simple-format #f "--enable-cached-compression=~A~A"
                         type
@@ -775,6 +785,27 @@ (define (cached-compression-configuration->options cached-compression)
                (simple-format #f "--cached-compression-directory-max-size=~A=~A"
                               type
                               directory-max-size))
+              '())
+        ,@(if unused-removal-duration
+              (list
+               (simple-format
+                #f "--cached-compression-unused-removal-duration=~A=~A"
+                type
+                unused-removal-duration))
+              '())
+        ,@(if ttl
+              (list
+               (simple-format
+                #f "--cached-compression-ttl=~A=~A"
+                type
+                ttl))
+              '())
+        ,@(if new-ttl
+              (list
+               (simple-format
+                #f "--cached-compression-new-ttl=~A=~A"
+                type
+                new-ttl))
               '()))))
 
   (match-record config <nar-herder-configuration>
@@ -783,7 +814,7 @@ (define (cached-compression-configuration->options cached-compression)
              database database-dump
              host port
              storage storage-limit storage-nar-removal-criteria
-             ttl negative-ttl log-level
+             ttl new-ttl negative-ttl log-level
              cached-compressions cached-compression-min-uses
              cached-compression-workers cached-compression-nar-source
              extra-environment-variables)
@@ -825,6 +856,9 @@ (define (cached-compression-configuration->options cached-compression)
                       #$@(if ttl
                              (list (string-append "--ttl=" ttl))
                              '())
+                      #$@(if new-ttl
+                             (list (string-append "--new-ttl=" new-ttl))
+                             '())
                       #$@(if negative-ttl
                              (list (string-append "--negative-ttl=" negative-ttl))
                              '())
-- 
cgit v1.2.3