diff options
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/ci.scm | 5 | ||||
| -rw-r--r-- | gnu/services/dns.scm | 2 | ||||
| -rw-r--r-- | gnu/services/guix.scm | 6 | ||||
| -rw-r--r-- | gnu/services/herd.scm | 14 |
4 files changed, 15 insertions, 12 deletions
diff --git a/gnu/services/ci.scm b/gnu/services/ci.scm index 595cad347e..08416e9962 100644 --- a/gnu/services/ci.scm +++ b/gnu/services/ci.scm @@ -180,6 +180,8 @@ (default "/var/lib/forgejo-runner")) (run-directory forgejo-runner-configuration-run-directory (default "/var/run/forgejo-runner")) + (log-file forgejo-runner-configuration-log-file + (default "/var/log/forgejo-runner.log")) ;; Configuration options for the YAML config file: ;; <https://forgejo.org/docs/latest/admin/runner-installation/#configuration>. @@ -259,7 +261,7 @@ (define (forgejo-runner-shepherd-service config) (match-record config <forgejo-runner-configuration> - (package data-directory run-directory name + (package data-directory run-directory log-file name capacity timeout fetch-timeout fetch-interval report-interval labels) (define runner (file-append package "/bin/forgejo-runner")) @@ -286,6 +288,7 @@ #:user "forgejo-runner" #:group "forgejo-runner" #:directory #$run-directory + #:log-file #$log-file #:environment-variables ;; Provide access to a fresh Guix obtained via 'guix ;; pull'. diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 338ba012d0..42a65a2767 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -1147,7 +1147,7 @@ log.") (let ((config-file (unbound-config-file config))) (list (shepherd-service (documentation "Unbound daemon.") - (provision '(unbound dns)) + (provision '(unbound)) ;; unbound may be bound to a particular IP address, hence ;; only start it after the networking service has started. (requirement '(user-processes networking)) diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index cb8f6ef4f7..ee5913a1d8 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -844,6 +844,10 @@ 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 @@ -968,6 +972,8 @@ 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 port)) + #$(string-append "--control-host=" host) #$@(if mirror (list (string-append "--mirror=" mirror)) '()) diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm index 06361ba49e..d276ba1b74 100644 --- a/gnu/services/herd.scm +++ b/gnu/services/herd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2019, 2022-2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016-2019, 2022-2023, 2025 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop> ;;; @@ -58,7 +58,6 @@ unload-services unload-service load-services - load-services/safe start-service stop-service restart-service @@ -297,14 +296,9 @@ service is transient." "Load and register the services from FILES, where FILES contain code that returns a shepherd <service> object." (eval-there `(register-services - ,@(map (lambda (file) - `(primitive-load ,file)) - files)))) - -(define load-services/safe - ;; Deprecated. It used to behave differently before service replacements - ;; were a thing. - load-services) + (list ,@(map (lambda (file) + `(primitive-load ,file)) + files))))) (define* (start-service name #:optional (arguments '())) (invoke-action name 'start arguments |