diff options
Diffstat (limited to 'gnu/services/guix.scm')
| -rw-r--r-- | gnu/services/guix.scm | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index cb8f6ef4f7..51aaf550bf 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -126,14 +126,18 @@ nar-herder-configuration-database-dump nar-herder-configuration-host nar-herder-configuration-port + nar-herder-configuration-control-host + nar-herder-configuration-control-port nar-herder-configuration-storage nar-herder-configuration-storage-limit + nar-herder-configuration-storage-minimum-free-space nar-herder-configuration-storage-nar-removal-criteria nar-herder-configuration-log-level nar-herder-configuration-cached-compressions nar-herder-configuration-cached-compression-min-uses nar-herder-configuration-cached-compression-workers nar-herder-configuration-cached-compression-nar-source + nar-herder-configuration-extra-options nar-herder-configuration-extra-environment-variables nar-herder-cached-compression-configuration @@ -844,10 +848,17 @@ ca-certificates.crt file in the system profile." (default "127.0.0.1")) (port nar-herder-configuration-port (default 8734)) + (control-host nar-herder-configuration-control-host + (default "127.0.0.1")) + (control-port nar-herder-configuration-control-port + (default 8735)) (storage nar-herder-configuration-storage (default #f)) (storage-limit nar-herder-configuration-storage-limit (default "none")) + (storage-minimum-free-space + nar-herder-configuration-storage-minimum-free-space + (default "none")) (storage-nar-removal-criteria nar-herder-configuration-storage-nar-removal-criteria (default '())) @@ -871,6 +882,9 @@ ca-certificates.crt file in the system profile." (cached-compression-nar-source nar-herder-configuration-cached-compression-nar-source (default #f)) + (extra-options + nar-herder-configuration-extra-options + (default '())) (extra-environment-variables nar-herder-configuration-extra-environment-variables (default '()))) @@ -947,10 +961,13 @@ ca-certificates.crt file in the system profile." mirror database database-dump host port - storage storage-limit storage-nar-removal-criteria + control-host control-port + storage storage-limit storage-minimum-free-space + storage-nar-removal-criteria ttl new-ttl negative-ttl log-level cached-compressions cached-compression-min-uses cached-compression-workers cached-compression-nar-source + extra-options extra-environment-variables) (unless (or mirror storage) @@ -968,6 +985,10 @@ ca-certificates.crt file in the system profile." "--pid-file=/var/run/nar-herder/pid" #$(string-append "--port=" (number->string port)) #$(string-append "--host=" host) + #$(string-append "--control-port=" + (number->string control-port)) + #$(string-append "--control-host=" + control-host) #$@(if mirror (list (string-append "--mirror=" mirror)) '()) @@ -980,6 +1001,11 @@ ca-certificates.crt file in the system profile." (if (number? storage-limit) (number->string storage-limit) storage-limit)) + #$(string-append + "--storage-minimum-free-space=" + (if (number? storage-minimum-free-space) + (number->string storage-minimum-free-space) + storage-minimum-free-space)) #$@(map (lambda (criteria) (string-append "--storage-nar-removal-criteria=" @@ -1016,7 +1042,8 @@ ca-certificates.crt file in the system profile." (list (simple-format #f "--cached-compression-nar-source=~A" cached-compression-nar-source)) - '())) + '()) + #$@extra-options) #:user #$user #:group #$group #:directory "/var/lib/nar-herder" |