2019-09-15 14:16:11 -04:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
|
|
|
|
;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>
|
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify
|
|
|
|
|
;;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;;; (at your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful,
|
|
|
|
|
;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
(define-module (gnu services guix)
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2019-09-15 14:16:11 -04:00
|
|
|
|
#:use-module (ice-9 match)
|
|
|
|
|
#:use-module (guix gexp)
|
|
|
|
|
#:use-module (guix records)
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
#:use-module (guix packages)
|
2019-09-15 14:16:11 -04:00
|
|
|
|
#:use-module ((gnu packages base)
|
|
|
|
|
#:select (glibc-utf8-locales))
|
|
|
|
|
#:use-module (gnu packages admin)
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
#:use-module (gnu packages databases)
|
2019-09-15 14:16:11 -04:00
|
|
|
|
#:use-module (gnu packages web)
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
#:use-module (gnu packages guile)
|
|
|
|
|
#:use-module (gnu packages guile-xyz)
|
|
|
|
|
#:use-module (gnu packages package-management)
|
2019-09-15 14:16:11 -04:00
|
|
|
|
#:use-module (gnu services)
|
|
|
|
|
#:use-module (gnu services base)
|
|
|
|
|
#:use-module (gnu services admin)
|
|
|
|
|
#:use-module (gnu services shepherd)
|
|
|
|
|
#:use-module (gnu services getmail)
|
|
|
|
|
#:use-module (gnu system shadow)
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
#:export (guix-build-coordinator-configuration
|
|
|
|
|
guix-build-coordinator-configuration?
|
|
|
|
|
guix-build-coordinator-configuration-package
|
|
|
|
|
guix-build-coordinator-configuration-user
|
|
|
|
|
guix-build-coordinator-configuration-group
|
|
|
|
|
guix-build-coordinator-configuration-datastore-uri-string
|
|
|
|
|
guix-build-coordinator-configuration-agent-communication-uri-string
|
|
|
|
|
guix-build-coordinator-configuration-client-communication-uri-string
|
|
|
|
|
guix-build-coordinator-configuration-allocation-strategy
|
|
|
|
|
guix-build-coordinator-configuration-hooks
|
|
|
|
|
guix-build-coordinator-configuration-guile
|
|
|
|
|
|
|
|
|
|
guix-build-coordinator-service-type
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
guix-build-coordinator-agent-configuration
|
|
|
|
|
guix-build-coordinator-agent-configuration?
|
|
|
|
|
guix-build-coordinator-agent-configuration-package
|
|
|
|
|
guix-build-coordinator-agent-configuration-user
|
|
|
|
|
guix-build-coordinator-agent-configuration-coordinator
|
services: guix-build-coordinator: Rework authentication config.
A new authentication approach has been added to the coordinator, so to better
represent the options, this commit changes the configuration to accept
different records, each for different authentication approaches.
* gnu/services/guix.scm (guix-build-coordinator-agent-configuration-uuid,
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file): Removed
procedures.
(guix-build-coordinator-agent-password-auth,
guix-build-coordinator-agent-password-auth?,
guix-build-coordinator-agent-password-auth-uuid,
guix-build-coordinator-agent-password-auth-password,
guix-build-coordinator-agent-password-file-auth,
guix-build-coordinator-agent-password-file-auth?,
guix-build-coordinator-agent-password-file-auth-uuid,
guix-build-coordinator-agent-password-file-auth-password-file): New
procedures.
(guix-build-coordinator-agent-shepherd-services): Adjust to handle the
authentication field and it's possible record values.
* doc/guix.texi (Guix Build Coordinator): Update documentation.
2021-02-28 16:11:58 -05:00
|
|
|
|
guix-build-coordinator-agent-configuration-authentication
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
guix-build-coordinator-agent-configuration-systems
|
|
|
|
|
guix-build-coordinator-agent-configuration-max-parallel-builds
|
2021-04-23 06:00:56 -04:00
|
|
|
|
guix-build-coordinator-agent-configuration-max-1min-load-average
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
guix-build-coordinator-agent-configuration-derivation-substitute-urls
|
|
|
|
|
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls
|
|
|
|
|
|
services: guix-build-coordinator: Rework authentication config.
A new authentication approach has been added to the coordinator, so to better
represent the options, this commit changes the configuration to accept
different records, each for different authentication approaches.
* gnu/services/guix.scm (guix-build-coordinator-agent-configuration-uuid,
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file): Removed
procedures.
(guix-build-coordinator-agent-password-auth,
guix-build-coordinator-agent-password-auth?,
guix-build-coordinator-agent-password-auth-uuid,
guix-build-coordinator-agent-password-auth-password,
guix-build-coordinator-agent-password-file-auth,
guix-build-coordinator-agent-password-file-auth?,
guix-build-coordinator-agent-password-file-auth-uuid,
guix-build-coordinator-agent-password-file-auth-password-file): New
procedures.
(guix-build-coordinator-agent-shepherd-services): Adjust to handle the
authentication field and it's possible record values.
* doc/guix.texi (Guix Build Coordinator): Update documentation.
2021-02-28 16:11:58 -05:00
|
|
|
|
guix-build-coordinator-agent-password-auth
|
|
|
|
|
guix-build-coordinator-agent-password-auth?
|
|
|
|
|
guix-build-coordinator-agent-password-auth-uuid
|
|
|
|
|
guix-build-coordinator-agent-password-auth-password
|
|
|
|
|
|
|
|
|
|
guix-build-coordinator-agent-password-file-auth
|
|
|
|
|
guix-build-coordinator-agent-password-file-auth?
|
|
|
|
|
guix-build-coordinator-agent-password-file-auth-uuid
|
|
|
|
|
guix-build-coordinator-agent-password-file-auth-password-file
|
|
|
|
|
|
2021-02-28 16:35:36 -05:00
|
|
|
|
guix-build-coordinator-agent-dynamic-auth
|
|
|
|
|
guix-build-coordinator-agent-dynamic-auth?
|
|
|
|
|
guix-build-coordinator-agent-dynamic-auth-agent-name
|
|
|
|
|
guix-build-coordinator-agent-dynamic-auth-token
|
|
|
|
|
|
2021-03-05 04:29:58 -05:00
|
|
|
|
guix-build-coordinator-agent-dynamic-auth-with-file
|
|
|
|
|
guix-build-coordinator-agent-dynamic-auth-with-file?
|
|
|
|
|
guix-build-coordinator-agent-dynamic-auth-with-file-agent-name
|
|
|
|
|
guix-build-coordinator-agent-dynamic-auth-with-file-token-file
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
guix-build-coordinator-agent-service-type
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-queue-builds-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-queue-builds-configuration>):
New record type.
(guix-build-coordinator-queue-builds-configuration,
guix-build-coordinator-queue-builds-configuration?,
guix-build-coordinator-queue-builds-configuration-package,
guix-build-coordinator-queue-builds-configuration-user,
guix-build-coordinator-queue-builds-coordinator,
guix-build-coordinator-queue-builds-configuration-systems,
guix-build-coordinator-queue-builds-configuration-system-and-targets,
guix-build-coordinator-queue-builds-configuration-guix-data-service,
guix-build-coordinator-queue-builds-configuration-processed-commits-file,
guix-build-coordinator-queue-builds-shepherd-services,
guix-build-coordinator-queue-builds-activation,
guix-build-coordinator-queue-builds-account): New procedures.
(guix-build-coordinator-queue-builds-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-18 09:21:13 -04:00
|
|
|
|
guix-build-coordinator-queue-builds-configuration
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration?
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration-package
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration-user
|
|
|
|
|
guix-build-coordinator-queue-builds-coordinator
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration-systems
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration-system-and-targets
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration-guix-data-service
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration-processed-commits-file
|
|
|
|
|
|
|
|
|
|
guix-build-coordinator-queue-builds-service-type
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
<guix-data-service-configuration>
|
2019-09-15 14:16:11 -04:00
|
|
|
|
guix-data-service-configuration
|
|
|
|
|
guix-data-service-configuration?
|
|
|
|
|
guix-data-service-package
|
|
|
|
|
guix-data-service-user
|
|
|
|
|
guix-data-service-group
|
|
|
|
|
guix-data-service-port
|
|
|
|
|
guix-data-service-host
|
|
|
|
|
guix-data-service-getmail-idle-mailboxes
|
|
|
|
|
guix-data-service-commits-getmail-retriever-configuration
|
|
|
|
|
|
|
|
|
|
guix-data-service-type))
|
|
|
|
|
|
|
|
|
|
;;;; Commentary:
|
|
|
|
|
;;;
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
;;; Services specifically related to GNU Guix.
|
2019-09-15 14:16:11 -04:00
|
|
|
|
;;;
|
|
|
|
|
;;;; Code:
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
(define-record-type* <guix-build-coordinator-configuration>
|
|
|
|
|
guix-build-coordinator-configuration make-guix-build-coordinator-configuration
|
|
|
|
|
guix-build-coordinator-configuration?
|
|
|
|
|
(package guix-build-coordinator-configuration-package
|
|
|
|
|
(default guix-build-coordinator))
|
|
|
|
|
(user guix-build-coordinator-configuration-user
|
|
|
|
|
(default "guix-build-coordinator"))
|
|
|
|
|
(group guix-build-coordinator-configuration-group
|
|
|
|
|
(default "guix-build-coordinator"))
|
|
|
|
|
(database-uri-string
|
|
|
|
|
guix-build-coordinator-configuration-datastore-uri-string
|
|
|
|
|
(default "sqlite:///var/lib/guix-build-coordinator/guix_build_coordinator.db"))
|
|
|
|
|
(agent-communication-uri-string
|
|
|
|
|
guix-build-coordinator-configuration-agent-communication-uri-string
|
|
|
|
|
(default "http://0.0.0.0:8745"))
|
|
|
|
|
(client-communication-uri-string
|
|
|
|
|
guix-build-coordinator-configuration-client-communication-uri-string
|
|
|
|
|
(default "http://127.0.0.1:8746"))
|
|
|
|
|
(allocation-strategy
|
|
|
|
|
guix-build-coordinator-configuration-allocation-strategy
|
|
|
|
|
(default #~basic-build-allocation-strategy))
|
|
|
|
|
(hooks guix-build-coordinator-configuration-hooks
|
|
|
|
|
(default '()))
|
|
|
|
|
(guile guix-build-coordinator-configuration-guile
|
|
|
|
|
(default guile-3.0-latest)))
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
(define-record-type* <guix-build-coordinator-agent-configuration>
|
|
|
|
|
guix-build-coordinator-agent-configuration
|
|
|
|
|
make-guix-build-coordinator-agent-configuration
|
|
|
|
|
guix-build-coordinator-agent-configuration?
|
|
|
|
|
(package guix-build-coordinator-agent-configuration-package
|
2022-01-02 12:44:09 -05:00
|
|
|
|
(default guix-build-coordinator/agent-only))
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
(user guix-build-coordinator-agent-configuration-user
|
|
|
|
|
(default "guix-build-coordinator-agent"))
|
|
|
|
|
(coordinator guix-build-coordinator-agent-configuration-coordinator
|
|
|
|
|
(default "http://localhost:8745"))
|
services: guix-build-coordinator: Rework authentication config.
A new authentication approach has been added to the coordinator, so to better
represent the options, this commit changes the configuration to accept
different records, each for different authentication approaches.
* gnu/services/guix.scm (guix-build-coordinator-agent-configuration-uuid,
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file): Removed
procedures.
(guix-build-coordinator-agent-password-auth,
guix-build-coordinator-agent-password-auth?,
guix-build-coordinator-agent-password-auth-uuid,
guix-build-coordinator-agent-password-auth-password,
guix-build-coordinator-agent-password-file-auth,
guix-build-coordinator-agent-password-file-auth?,
guix-build-coordinator-agent-password-file-auth-uuid,
guix-build-coordinator-agent-password-file-auth-password-file): New
procedures.
(guix-build-coordinator-agent-shepherd-services): Adjust to handle the
authentication field and it's possible record values.
* doc/guix.texi (Guix Build Coordinator): Update documentation.
2021-02-28 16:11:58 -05:00
|
|
|
|
(authentication guix-build-coordinator-agent-configuration-authentication)
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
(systems guix-build-coordinator-agent-configuration-systems
|
|
|
|
|
(default #f))
|
|
|
|
|
(max-parallel-builds
|
|
|
|
|
guix-build-coordinator-agent-configuration-max-parallel-builds
|
|
|
|
|
(default 1))
|
2021-04-23 06:00:56 -04:00
|
|
|
|
(max-1min-load-average
|
|
|
|
|
guix-build-coordinator-agent-configuration-max-1min-load-average
|
|
|
|
|
(default #f))
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
(derivation-substitute-urls
|
|
|
|
|
guix-build-coordinator-agent-configuration-derivation-substitute-urls
|
|
|
|
|
(default #f))
|
|
|
|
|
(non-derivation-substitute-urls
|
|
|
|
|
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls
|
|
|
|
|
(default #f)))
|
|
|
|
|
|
services: guix-build-coordinator: Rework authentication config.
A new authentication approach has been added to the coordinator, so to better
represent the options, this commit changes the configuration to accept
different records, each for different authentication approaches.
* gnu/services/guix.scm (guix-build-coordinator-agent-configuration-uuid,
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file): Removed
procedures.
(guix-build-coordinator-agent-password-auth,
guix-build-coordinator-agent-password-auth?,
guix-build-coordinator-agent-password-auth-uuid,
guix-build-coordinator-agent-password-auth-password,
guix-build-coordinator-agent-password-file-auth,
guix-build-coordinator-agent-password-file-auth?,
guix-build-coordinator-agent-password-file-auth-uuid,
guix-build-coordinator-agent-password-file-auth-password-file): New
procedures.
(guix-build-coordinator-agent-shepherd-services): Adjust to handle the
authentication field and it's possible record values.
* doc/guix.texi (Guix Build Coordinator): Update documentation.
2021-02-28 16:11:58 -05:00
|
|
|
|
(define-record-type* <guix-build-coordinator-agent-password-auth>
|
|
|
|
|
guix-build-coordinator-agent-password-auth
|
|
|
|
|
make-guix-build-coordinator-agent-password-auth
|
|
|
|
|
guix-build-coordinator-agent-password-auth?
|
|
|
|
|
(uuid guix-build-coordinator-agent-password-auth-uuid)
|
|
|
|
|
(password guix-build-coordinator-agent-password-auth-password))
|
|
|
|
|
|
|
|
|
|
(define-record-type* <guix-build-coordinator-agent-password-file-auth>
|
|
|
|
|
guix-build-coordinator-agent-password-file-auth
|
|
|
|
|
make-guix-build-coordinator-agent-password-file-auth
|
|
|
|
|
guix-build-coordinator-agent-password-file-auth?
|
|
|
|
|
(uuid guix-build-coordinator-agent-password-file-auth-uuid)
|
|
|
|
|
(password-file
|
|
|
|
|
guix-build-coordinator-agent-password-file-auth-password-file))
|
|
|
|
|
|
2021-02-28 16:35:36 -05:00
|
|
|
|
(define-record-type* <guix-build-coordinator-agent-dynamic-auth>
|
|
|
|
|
guix-build-coordinator-agent-dynamic-auth
|
|
|
|
|
make-guix-build-coordinator-agent-dynamic-auth
|
|
|
|
|
guix-build-coordinator-agent-dynamic-auth?
|
|
|
|
|
(agent-name guix-build-coordinator-agent-dynamic-auth-agent-name)
|
|
|
|
|
(token guix-build-coordinator-agent-dynamic-auth-token))
|
|
|
|
|
|
2021-03-05 04:29:58 -05:00
|
|
|
|
(define-record-type* <guix-build-coordinator-agent-dynamic-auth-with-file>
|
|
|
|
|
guix-build-coordinator-agent-dynamic-auth-with-file
|
|
|
|
|
make-guix-build-coordinator-agent-dynamic-auth-with-file
|
|
|
|
|
guix-build-coordinator-agent-dynamic-auth-with-file?
|
|
|
|
|
(agent-name guix-build-coordinator-agent-dynamic-auth-with-file-agent-name)
|
|
|
|
|
(token-file guix-build-coordinator-agent-dynamic-auth-with-file-token-file))
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-queue-builds-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-queue-builds-configuration>):
New record type.
(guix-build-coordinator-queue-builds-configuration,
guix-build-coordinator-queue-builds-configuration?,
guix-build-coordinator-queue-builds-configuration-package,
guix-build-coordinator-queue-builds-configuration-user,
guix-build-coordinator-queue-builds-coordinator,
guix-build-coordinator-queue-builds-configuration-systems,
guix-build-coordinator-queue-builds-configuration-system-and-targets,
guix-build-coordinator-queue-builds-configuration-guix-data-service,
guix-build-coordinator-queue-builds-configuration-processed-commits-file,
guix-build-coordinator-queue-builds-shepherd-services,
guix-build-coordinator-queue-builds-activation,
guix-build-coordinator-queue-builds-account): New procedures.
(guix-build-coordinator-queue-builds-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-18 09:21:13 -04:00
|
|
|
|
(define-record-type* <guix-build-coordinator-queue-builds-configuration>
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration
|
|
|
|
|
make-guix-build-coordinator-queue-builds-configuration
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration?
|
|
|
|
|
(package guix-build-coordinator-queue-builds-configuration-package
|
|
|
|
|
(default guix-build-coordinator))
|
|
|
|
|
(user guix-build-coordinator-queue-builds-configuration-user
|
|
|
|
|
(default "guix-build-coordinator-queue-builds"))
|
|
|
|
|
(coordinator guix-build-coordinator-queue-builds-coordinator
|
2021-04-23 10:01:58 -04:00
|
|
|
|
(default "http://localhost:8746"))
|
services: guix: Add guix-build-coordinator-queue-builds-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-queue-builds-configuration>):
New record type.
(guix-build-coordinator-queue-builds-configuration,
guix-build-coordinator-queue-builds-configuration?,
guix-build-coordinator-queue-builds-configuration-package,
guix-build-coordinator-queue-builds-configuration-user,
guix-build-coordinator-queue-builds-coordinator,
guix-build-coordinator-queue-builds-configuration-systems,
guix-build-coordinator-queue-builds-configuration-system-and-targets,
guix-build-coordinator-queue-builds-configuration-guix-data-service,
guix-build-coordinator-queue-builds-configuration-processed-commits-file,
guix-build-coordinator-queue-builds-shepherd-services,
guix-build-coordinator-queue-builds-activation,
guix-build-coordinator-queue-builds-account): New procedures.
(guix-build-coordinator-queue-builds-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-18 09:21:13 -04:00
|
|
|
|
(systems guix-build-coordinator-queue-builds-configuration-systems
|
|
|
|
|
(default #f))
|
|
|
|
|
(systems-and-targets
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration-system-and-targets
|
|
|
|
|
(default #f))
|
|
|
|
|
(guix-data-service
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration-guix-data-service
|
|
|
|
|
(default "https://data.guix.gnu.org"))
|
|
|
|
|
(processed-commits-file
|
|
|
|
|
guix-build-coordinator-queue-builds-configuration-processed-commits-file
|
|
|
|
|
(default "/var/cache/guix-build-coordinator-queue-builds/processed-commits")))
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
(define* (make-guix-build-coordinator-start-script database-uri-string
|
|
|
|
|
allocation-strategy
|
|
|
|
|
pid-file
|
|
|
|
|
guix-build-coordinator-package
|
|
|
|
|
#:key
|
|
|
|
|
agent-communication-uri-string
|
|
|
|
|
client-communication-uri-string
|
|
|
|
|
(hooks '())
|
|
|
|
|
(guile guile-3.0))
|
|
|
|
|
(program-file
|
|
|
|
|
"start-guix-build-coordinator"
|
|
|
|
|
(with-extensions (cons guix-build-coordinator-package
|
|
|
|
|
;; This is a poorly constructed Guile load path,
|
|
|
|
|
;; since it contains things that aren't Guile
|
|
|
|
|
;; libraries, but it means that the Guile libraries
|
|
|
|
|
;; needed for the Guix Build Coordinator don't need
|
|
|
|
|
;; to be individually specified here.
|
2020-10-23 09:59:17 -04:00
|
|
|
|
(append
|
|
|
|
|
(map second (package-inputs
|
|
|
|
|
guix-build-coordinator-package))
|
|
|
|
|
(map second (package-propagated-inputs
|
|
|
|
|
guix-build-coordinator-package))))
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (srfi srfi-1)
|
|
|
|
|
(ice-9 match)
|
|
|
|
|
(web uri)
|
|
|
|
|
(prometheus)
|
|
|
|
|
(guix-build-coordinator hooks)
|
|
|
|
|
(guix-build-coordinator datastore)
|
|
|
|
|
(guix-build-coordinator build-allocator)
|
|
|
|
|
(guix-build-coordinator coordinator))
|
|
|
|
|
|
2020-10-22 09:21:19 -04:00
|
|
|
|
(setvbuf (current-output-port) 'line)
|
|
|
|
|
(setvbuf (current-error-port) 'line)
|
|
|
|
|
|
2020-10-22 09:21:19 -04:00
|
|
|
|
(simple-format #t "starting the guix-build-coordinator:\n ~A\n"
|
|
|
|
|
(current-filename))
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
(let* ((metrics-registry (make-metrics-registry
|
|
|
|
|
#:namespace
|
2020-10-23 09:58:19 -04:00
|
|
|
|
"guixbuildcoordinator"))
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
(datastore (database-uri->datastore
|
|
|
|
|
#$database-uri-string
|
|
|
|
|
#:metrics-registry metrics-registry))
|
|
|
|
|
(hooks
|
|
|
|
|
(list #$@(map (match-lambda
|
|
|
|
|
((name . hook-gexp)
|
2020-10-22 07:31:49 -04:00
|
|
|
|
#~(cons '#$name #$hook-gexp)))
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
hooks)))
|
|
|
|
|
(hooks-with-defaults
|
|
|
|
|
`(,@hooks
|
|
|
|
|
,@(remove (match-lambda
|
|
|
|
|
((name . _) (assq-ref hooks name)))
|
|
|
|
|
%default-hooks)))
|
|
|
|
|
(build-coordinator (make-build-coordinator
|
|
|
|
|
#:datastore datastore
|
|
|
|
|
#:hooks hooks-with-defaults
|
|
|
|
|
#:metrics-registry metrics-registry
|
|
|
|
|
#:allocation-strategy #$allocation-strategy)))
|
|
|
|
|
|
|
|
|
|
(run-coordinator-service
|
|
|
|
|
build-coordinator
|
|
|
|
|
#:update-datastore? #t
|
|
|
|
|
#:pid-file #$pid-file
|
|
|
|
|
#:agent-communication-uri (string->uri
|
|
|
|
|
#$agent-communication-uri-string)
|
|
|
|
|
#:client-communication-uri (string->uri
|
|
|
|
|
#$client-communication-uri-string)))))
|
|
|
|
|
#:guile guile))
|
|
|
|
|
|
|
|
|
|
(define (guix-build-coordinator-shepherd-services config)
|
|
|
|
|
(match-record config <guix-build-coordinator-configuration>
|
|
|
|
|
(package user group database-uri-string
|
|
|
|
|
agent-communication-uri-string
|
|
|
|
|
client-communication-uri-string
|
|
|
|
|
allocation-strategy
|
|
|
|
|
hooks
|
|
|
|
|
guile)
|
|
|
|
|
(list
|
|
|
|
|
(shepherd-service
|
|
|
|
|
(documentation "Guix Build Coordinator")
|
|
|
|
|
(provision '(guix-build-coordinator))
|
|
|
|
|
(requirement '(networking))
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
(list #$(make-guix-build-coordinator-start-script
|
|
|
|
|
database-uri-string
|
|
|
|
|
allocation-strategy
|
|
|
|
|
"/var/run/guix-build-coordinator/pid"
|
|
|
|
|
package
|
|
|
|
|
#:agent-communication-uri-string
|
|
|
|
|
agent-communication-uri-string
|
|
|
|
|
#:client-communication-uri-string
|
|
|
|
|
client-communication-uri-string
|
|
|
|
|
#:hooks hooks
|
|
|
|
|
#:guile guile))
|
|
|
|
|
#:user #$user
|
|
|
|
|
#:group #$group
|
|
|
|
|
#:pid-file "/var/run/guix-build-coordinator/pid"
|
|
|
|
|
;; Allow time for migrations to run
|
|
|
|
|
#:pid-file-timeout 60
|
|
|
|
|
#:environment-variables
|
|
|
|
|
`(,(string-append
|
|
|
|
|
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
2020-10-22 09:37:14 -04:00
|
|
|
|
"LC_ALL=en_US.utf8"
|
|
|
|
|
"PATH=/run/current-system/profile/bin") ; for hooks
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
#:log-file "/var/log/guix-build-coordinator/coordinator.log"))
|
|
|
|
|
(stop #~(make-kill-destructor))))))
|
|
|
|
|
|
|
|
|
|
(define (guix-build-coordinator-activation config)
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
|
2021-04-23 08:38:49 -04:00
|
|
|
|
(define %user
|
|
|
|
|
(getpw #$(guix-build-coordinator-configuration-user
|
|
|
|
|
config)))
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
|
|
|
|
|
(chmod "/var/lib/guix-build-coordinator" #o755)
|
|
|
|
|
|
|
|
|
|
(mkdir-p "/var/log/guix-build-coordinator")
|
|
|
|
|
|
|
|
|
|
;; Allow writing the PID file
|
|
|
|
|
(mkdir-p "/var/run/guix-build-coordinator")
|
|
|
|
|
(chown "/var/run/guix-build-coordinator"
|
|
|
|
|
(passwd:uid %user)
|
|
|
|
|
(passwd:gid %user))))
|
|
|
|
|
|
|
|
|
|
(define (guix-build-coordinator-account config)
|
|
|
|
|
(match-record config <guix-build-coordinator-configuration>
|
|
|
|
|
(user group)
|
|
|
|
|
(list (user-group
|
|
|
|
|
(name group)
|
|
|
|
|
(system? #t))
|
|
|
|
|
(user-account
|
|
|
|
|
(name user)
|
|
|
|
|
(group group)
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "Guix Build Coordinator user")
|
|
|
|
|
(home-directory "/var/lib/guix-build-coordinator")
|
|
|
|
|
(shell (file-append shadow "/sbin/nologin"))))))
|
|
|
|
|
|
|
|
|
|
(define guix-build-coordinator-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'guix-build-coordinator)
|
|
|
|
|
(extensions
|
|
|
|
|
(list
|
|
|
|
|
(service-extension shepherd-root-service-type
|
|
|
|
|
guix-build-coordinator-shepherd-services)
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
guix-build-coordinator-activation)
|
|
|
|
|
(service-extension account-service-type
|
|
|
|
|
guix-build-coordinator-account)))
|
|
|
|
|
(default-value
|
|
|
|
|
(guix-build-coordinator-configuration))
|
|
|
|
|
(description
|
|
|
|
|
"Run an instance of the Guix Build Coordinator.")))
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
(define (guix-build-coordinator-agent-shepherd-services config)
|
|
|
|
|
(match-record config <guix-build-coordinator-agent-configuration>
|
services: guix-build-coordinator: Rework authentication config.
A new authentication approach has been added to the coordinator, so to better
represent the options, this commit changes the configuration to accept
different records, each for different authentication approaches.
* gnu/services/guix.scm (guix-build-coordinator-agent-configuration-uuid,
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file): Removed
procedures.
(guix-build-coordinator-agent-password-auth,
guix-build-coordinator-agent-password-auth?,
guix-build-coordinator-agent-password-auth-uuid,
guix-build-coordinator-agent-password-auth-password,
guix-build-coordinator-agent-password-file-auth,
guix-build-coordinator-agent-password-file-auth?,
guix-build-coordinator-agent-password-file-auth-uuid,
guix-build-coordinator-agent-password-file-auth-password-file): New
procedures.
(guix-build-coordinator-agent-shepherd-services): Adjust to handle the
authentication field and it's possible record values.
* doc/guix.texi (Guix Build Coordinator): Update documentation.
2021-02-28 16:11:58 -05:00
|
|
|
|
(package user coordinator authentication max-parallel-builds
|
2021-04-23 06:00:56 -04:00
|
|
|
|
max-1min-load-average
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
derivation-substitute-urls non-derivation-substitute-urls
|
|
|
|
|
systems)
|
|
|
|
|
(list
|
|
|
|
|
(shepherd-service
|
|
|
|
|
(documentation "Guix Build Coordinator Agent")
|
|
|
|
|
(provision '(guix-build-coordinator-agent))
|
|
|
|
|
(requirement '(networking))
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
(list #$(file-append package "/bin/guix-build-coordinator-agent")
|
|
|
|
|
#$(string-append "--coordinator=" coordinator)
|
services: guix-build-coordinator: Rework authentication config.
A new authentication approach has been added to the coordinator, so to better
represent the options, this commit changes the configuration to accept
different records, each for different authentication approaches.
* gnu/services/guix.scm (guix-build-coordinator-agent-configuration-uuid,
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file): Removed
procedures.
(guix-build-coordinator-agent-password-auth,
guix-build-coordinator-agent-password-auth?,
guix-build-coordinator-agent-password-auth-uuid,
guix-build-coordinator-agent-password-auth-password,
guix-build-coordinator-agent-password-file-auth,
guix-build-coordinator-agent-password-file-auth?,
guix-build-coordinator-agent-password-file-auth-uuid,
guix-build-coordinator-agent-password-file-auth-password-file): New
procedures.
(guix-build-coordinator-agent-shepherd-services): Adjust to handle the
authentication field and it's possible record values.
* doc/guix.texi (Guix Build Coordinator): Update documentation.
2021-02-28 16:11:58 -05:00
|
|
|
|
#$@(match authentication
|
|
|
|
|
(($ <guix-build-coordinator-agent-password-auth>
|
|
|
|
|
uuid password)
|
|
|
|
|
#~(#$(string-append "--uuid=" uuid)
|
|
|
|
|
#$(string-append "--password=" password)))
|
|
|
|
|
(($ <guix-build-coordinator-agent-password-file-auth>
|
|
|
|
|
uuid password-file)
|
|
|
|
|
#~(#$(string-append "--uuid=" uuid)
|
|
|
|
|
#$(string-append "--password-file="
|
2021-02-28 16:35:36 -05:00
|
|
|
|
password-file)))
|
|
|
|
|
(($ <guix-build-coordinator-agent-dynamic-auth>
|
|
|
|
|
agent-name token)
|
|
|
|
|
#~(#$(string-append "--name=" agent-name)
|
2021-03-05 04:29:58 -05:00
|
|
|
|
#$(string-append "--dynamic-auth-token=" token)))
|
|
|
|
|
(($
|
|
|
|
|
<guix-build-coordinator-agent-dynamic-auth-with-file>
|
|
|
|
|
agent-name token-file)
|
|
|
|
|
#~(#$(string-append "--name=" agent-name)
|
|
|
|
|
#$(string-append "--dynamic-auth-token-file="
|
|
|
|
|
token-file))))
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
#$(simple-format #f "--max-parallel-builds=~A"
|
|
|
|
|
max-parallel-builds)
|
2021-04-23 06:00:56 -04:00
|
|
|
|
#$@(if max-1min-load-average
|
|
|
|
|
#~(#$(simple-format #f "--max-1min-load-average=~A"
|
|
|
|
|
max-1min-load-average))
|
|
|
|
|
#~())
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
#$@(if derivation-substitute-urls
|
|
|
|
|
#~(#$(string-append
|
|
|
|
|
"--derivation-substitute-urls="
|
|
|
|
|
(string-join derivation-substitute-urls " ")))
|
|
|
|
|
#~())
|
|
|
|
|
#$@(if non-derivation-substitute-urls
|
|
|
|
|
#~(#$(string-append
|
|
|
|
|
"--non-derivation-substitute-urls="
|
2020-11-07 15:34:48 -05:00
|
|
|
|
(string-join non-derivation-substitute-urls " ")))
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
#~())
|
|
|
|
|
#$@(map (lambda (system)
|
|
|
|
|
(string-append "--system=" system))
|
|
|
|
|
(or systems '())))
|
|
|
|
|
#:user #$user
|
|
|
|
|
#:environment-variables
|
|
|
|
|
`(,(string-append
|
|
|
|
|
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
2020-11-07 15:09:44 -05:00
|
|
|
|
;; XDG_CACHE_HOME is used by Guix when caching narinfo files
|
|
|
|
|
"XDG_CACHE_HOME=/var/cache/guix-build-coordinator-agent"
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
"LC_ALL=en_US.utf8")
|
|
|
|
|
#:log-file "/var/log/guix-build-coordinator/agent.log"))
|
|
|
|
|
(stop #~(make-kill-destructor))))))
|
|
|
|
|
|
|
|
|
|
(define (guix-build-coordinator-agent-activation config)
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
|
2021-04-23 08:38:49 -04:00
|
|
|
|
(define %user
|
|
|
|
|
(getpw #$(guix-build-coordinator-agent-configuration-user
|
|
|
|
|
config)))
|
2020-10-20 03:16:52 -04:00
|
|
|
|
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
(mkdir-p "/var/log/guix-build-coordinator")
|
|
|
|
|
|
2020-11-07 15:09:44 -05:00
|
|
|
|
;; Create a cache directory for storing narinfo files if downloaded
|
|
|
|
|
(mkdir-p "/var/cache/guix-build-coordinator-agent")
|
|
|
|
|
(chown "/var/cache/guix-build-coordinator-agent"
|
services: guix: Add guix-build-coordinator-agent-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): New
record type.
(guix-build-coordinator-agent-configuration,
guix-build-coordinator-agent-configuration?,
guix-build-coordinator-agent-configuration-package,
guix-build-coordinator-agent-configuration-user,
guix-build-coordinator-agent-configuration-coordinator,
guix-build-coordinator-agent-configuration-uuid),
guix-build-coordinator-agent-configuration-password,
guix-build-coordinator-agent-configuration-password-file,
guix-build-coordinator-agent-configuration-systems,
guix-build-coordinator-agent-configuration-max-parallel-builds,
guix-build-coordinator-agent-configuration-derivation-substitute-urls,
guix-build-coordinator-agent-configuration-non-derivation-substitute-urls,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-agent-activation,
guix-build-coordinator-agent-account): New procedures.
(guix-build-coordinator-agent-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 13:49:45 -04:00
|
|
|
|
(passwd:uid %user)
|
|
|
|
|
(passwd:gid %user))))
|
|
|
|
|
|
|
|
|
|
(define (guix-build-coordinator-agent-account config)
|
|
|
|
|
(list (user-account
|
|
|
|
|
(name (guix-build-coordinator-agent-configuration-user config))
|
|
|
|
|
(group "nogroup")
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "Guix Build Coordinator agent user")
|
|
|
|
|
(home-directory "/var/empty")
|
|
|
|
|
(shell (file-append shadow "/sbin/nologin")))))
|
|
|
|
|
|
|
|
|
|
(define guix-build-coordinator-agent-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'guix-build-coordinator-agent)
|
|
|
|
|
(extensions
|
|
|
|
|
(list
|
|
|
|
|
(service-extension shepherd-root-service-type
|
|
|
|
|
guix-build-coordinator-agent-shepherd-services)
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
guix-build-coordinator-agent-activation)
|
|
|
|
|
(service-extension account-service-type
|
|
|
|
|
guix-build-coordinator-agent-account)))
|
|
|
|
|
(description
|
|
|
|
|
"Run a Guix Build Coordinator agent.")))
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-queue-builds-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-queue-builds-configuration>):
New record type.
(guix-build-coordinator-queue-builds-configuration,
guix-build-coordinator-queue-builds-configuration?,
guix-build-coordinator-queue-builds-configuration-package,
guix-build-coordinator-queue-builds-configuration-user,
guix-build-coordinator-queue-builds-coordinator,
guix-build-coordinator-queue-builds-configuration-systems,
guix-build-coordinator-queue-builds-configuration-system-and-targets,
guix-build-coordinator-queue-builds-configuration-guix-data-service,
guix-build-coordinator-queue-builds-configuration-processed-commits-file,
guix-build-coordinator-queue-builds-shepherd-services,
guix-build-coordinator-queue-builds-activation,
guix-build-coordinator-queue-builds-account): New procedures.
(guix-build-coordinator-queue-builds-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-18 09:21:13 -04:00
|
|
|
|
(define (guix-build-coordinator-queue-builds-shepherd-services config)
|
|
|
|
|
(match-record config <guix-build-coordinator-queue-builds-configuration>
|
|
|
|
|
(package user coordinator systems systems-and-targets
|
|
|
|
|
guix-data-service processed-commits-file)
|
|
|
|
|
(list
|
|
|
|
|
(shepherd-service
|
|
|
|
|
(documentation "Guix Build Coordinator queue builds from Guix Data Service")
|
|
|
|
|
(provision '(guix-build-coordinator-queue-builds))
|
|
|
|
|
(requirement '(networking))
|
|
|
|
|
(start
|
|
|
|
|
#~(make-forkexec-constructor
|
|
|
|
|
(list
|
|
|
|
|
#$(file-append
|
|
|
|
|
package
|
|
|
|
|
"/bin/guix-build-coordinator-queue-builds-from-guix-data-service")
|
|
|
|
|
#$(string-append "--coordinator=" coordinator)
|
|
|
|
|
#$@(map (lambda (system)
|
|
|
|
|
(string-append "--system=" system))
|
|
|
|
|
(or systems '()))
|
|
|
|
|
#$@(map (match-lambda
|
|
|
|
|
((system . target)
|
|
|
|
|
(string-append "--system-and-target=" system "=" target)))
|
|
|
|
|
(or systems-and-targets '()))
|
|
|
|
|
#$@(if guix-data-service
|
|
|
|
|
#~(#$(string-append "--guix-data-service=" guix-data-service))
|
|
|
|
|
#~())
|
|
|
|
|
#$@(if processed-commits-file
|
|
|
|
|
#~(#$(string-append "--processed-commits-file="
|
|
|
|
|
processed-commits-file))
|
|
|
|
|
#~()))
|
|
|
|
|
#:user #$user
|
|
|
|
|
#:environment-variables
|
|
|
|
|
`(,(string-append
|
|
|
|
|
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
|
|
|
|
"LC_ALL=en_US.utf8")
|
|
|
|
|
#:log-file "/var/log/guix-build-coordinator/queue-builds.log"))
|
|
|
|
|
(stop #~(make-kill-destructor))))))
|
|
|
|
|
|
|
|
|
|
(define (guix-build-coordinator-queue-builds-activation config)
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
|
2021-04-23 08:38:49 -04:00
|
|
|
|
(define %user
|
|
|
|
|
(getpw #$(guix-build-coordinator-queue-builds-configuration-user
|
|
|
|
|
config)))
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-queue-builds-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-queue-builds-configuration>):
New record type.
(guix-build-coordinator-queue-builds-configuration,
guix-build-coordinator-queue-builds-configuration?,
guix-build-coordinator-queue-builds-configuration-package,
guix-build-coordinator-queue-builds-configuration-user,
guix-build-coordinator-queue-builds-coordinator,
guix-build-coordinator-queue-builds-configuration-systems,
guix-build-coordinator-queue-builds-configuration-system-and-targets,
guix-build-coordinator-queue-builds-configuration-guix-data-service,
guix-build-coordinator-queue-builds-configuration-processed-commits-file,
guix-build-coordinator-queue-builds-shepherd-services,
guix-build-coordinator-queue-builds-activation,
guix-build-coordinator-queue-builds-account): New procedures.
(guix-build-coordinator-queue-builds-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-18 09:21:13 -04:00
|
|
|
|
(mkdir-p "/var/log/guix-build-coordinator")
|
|
|
|
|
|
2021-05-02 04:56:42 -04:00
|
|
|
|
;; Allow writing the processed commits file
|
|
|
|
|
(mkdir-p "/var/cache/guix-build-coordinator-queue-builds")
|
|
|
|
|
(chown "/var/cache/guix-build-coordinator-queue-builds"
|
services: guix: Add guix-build-coordinator-queue-builds-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-queue-builds-configuration>):
New record type.
(guix-build-coordinator-queue-builds-configuration,
guix-build-coordinator-queue-builds-configuration?,
guix-build-coordinator-queue-builds-configuration-package,
guix-build-coordinator-queue-builds-configuration-user,
guix-build-coordinator-queue-builds-coordinator,
guix-build-coordinator-queue-builds-configuration-systems,
guix-build-coordinator-queue-builds-configuration-system-and-targets,
guix-build-coordinator-queue-builds-configuration-guix-data-service,
guix-build-coordinator-queue-builds-configuration-processed-commits-file,
guix-build-coordinator-queue-builds-shepherd-services,
guix-build-coordinator-queue-builds-activation,
guix-build-coordinator-queue-builds-account): New procedures.
(guix-build-coordinator-queue-builds-service-type): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-18 09:21:13 -04:00
|
|
|
|
(passwd:uid %user)
|
|
|
|
|
(passwd:gid %user))))
|
|
|
|
|
|
|
|
|
|
(define (guix-build-coordinator-queue-builds-account config)
|
|
|
|
|
(list (user-account
|
|
|
|
|
(name (guix-build-coordinator-queue-builds-configuration-user config))
|
|
|
|
|
(group "nogroup")
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "Guix Build Coordinator queue-builds user")
|
|
|
|
|
(home-directory "/var/empty")
|
|
|
|
|
(shell (file-append shadow "/sbin/nologin")))))
|
|
|
|
|
|
|
|
|
|
(define guix-build-coordinator-queue-builds-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'guix-build-coordinator-queue-builds)
|
|
|
|
|
(extensions
|
|
|
|
|
(list
|
|
|
|
|
(service-extension shepherd-root-service-type
|
|
|
|
|
guix-build-coordinator-queue-builds-shepherd-services)
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
guix-build-coordinator-queue-builds-activation)
|
|
|
|
|
(service-extension account-service-type
|
|
|
|
|
guix-build-coordinator-queue-builds-account)))
|
|
|
|
|
(description
|
|
|
|
|
"Run the guix-build-coordinator-queue-builds-from-guix-data-service
|
|
|
|
|
script.
|
|
|
|
|
|
|
|
|
|
This is a script to assist in having the Guix Build Coordinator build
|
|
|
|
|
derivations stored in an instance of the Guix Data Service.")))
|
|
|
|
|
|
services: guix: Add guix-build-coordinator-service-type.
* gnu/services/guix.scm (<guix-build-coordinator-configuration>): New record
type.
(guix-build-coordinator-configuration, guix-build-coordinator-configuration?,
guix-build-coordinator-configuration-package,
guix-build-coordinator-configuration-user,
guix-build-coordinator-configuration-group,
guix-build-coordinator-configuration-datastore-uri-string,
guix-build-coordinator-configuration-agent-communication-uri-string,
guix-build-coordinator-configuration-client-communication-uri-string,
guix-build-coordinator-configuration-allocation-strategy,
guix-build-coordinator-configuration-hooks,
guix-build-coordinator-configuration-guile,
make-guix-build-coordinator-start-script,
guix-build-coordinator-shepherd-services, guix-build-coordinator-activation,
guix-build-coordinator-account): New procedures.
(guix-build-coordinator-service-type): New variable.
* gnu/tests/guix.scm (%test-guix-build-coordinator): New variable.
* doc/guix.texi (Guix Services): Document it.
2020-09-17 10:45:04 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Guix Data Service
|
|
|
|
|
;;;
|
|
|
|
|
|
2019-09-15 14:16:11 -04:00
|
|
|
|
(define-record-type* <guix-data-service-configuration>
|
|
|
|
|
guix-data-service-configuration make-guix-data-service-configuration
|
|
|
|
|
guix-data-service-configuration?
|
|
|
|
|
(package guix-data-service-package
|
|
|
|
|
(default guix-data-service))
|
|
|
|
|
(user guix-data-service-configuration-user
|
|
|
|
|
(default "guix-data-service"))
|
|
|
|
|
(group guix-data-service-configuration-group
|
|
|
|
|
(default "guix-data-service"))
|
|
|
|
|
(port guix-data-service-port
|
|
|
|
|
(default 8765))
|
|
|
|
|
(host guix-data-service-host
|
|
|
|
|
(default "127.0.0.1"))
|
|
|
|
|
(getmail-idle-mailboxes
|
|
|
|
|
guix-data-service-getmail-idle-mailboxes
|
|
|
|
|
(default #f))
|
|
|
|
|
(commits-getmail-retriever-configuration
|
|
|
|
|
guix-data-service-commits-getmail-retriever-configuration
|
2020-03-01 15:56:37 -05:00
|
|
|
|
(default #f))
|
|
|
|
|
(extra-options guix-data-service-extra-options
|
|
|
|
|
(default '()))
|
|
|
|
|
(extra-process-jobs-options
|
|
|
|
|
guix-data-service-extra-process-jobs-options
|
|
|
|
|
(default '())))
|
2019-09-15 14:16:11 -04:00
|
|
|
|
|
|
|
|
|
(define (guix-data-service-profile-packages config)
|
|
|
|
|
"Return the guix-data-service package, this will populate the
|
|
|
|
|
ca-certificates.crt file in the system profile."
|
|
|
|
|
(list
|
|
|
|
|
(guix-data-service-package config)))
|
|
|
|
|
|
|
|
|
|
(define (guix-data-service-shepherd-services config)
|
|
|
|
|
(match-record config <guix-data-service-configuration>
|
2020-03-01 15:56:37 -05:00
|
|
|
|
(package user group port host extra-options extra-process-jobs-options)
|
2019-09-15 14:16:11 -04:00
|
|
|
|
(list
|
|
|
|
|
(shepherd-service
|
|
|
|
|
(documentation "Guix Data Service web server")
|
|
|
|
|
(provision '(guix-data-service))
|
|
|
|
|
(requirement '(postgres networking))
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
(list #$(file-append package
|
|
|
|
|
"/bin/guix-data-service")
|
|
|
|
|
"--pid-file=/var/run/guix-data-service/pid"
|
|
|
|
|
#$(string-append "--port=" (number->string port))
|
|
|
|
|
#$(string-append "--host=" host)
|
|
|
|
|
;; Perform any database migrations when the
|
|
|
|
|
;; service is started
|
2020-03-01 15:56:37 -05:00
|
|
|
|
"--update-database"
|
|
|
|
|
#$@extra-options)
|
2019-09-15 14:16:11 -04:00
|
|
|
|
|
|
|
|
|
#:user #$user
|
|
|
|
|
#:group #$group
|
|
|
|
|
#:pid-file "/var/run/guix-data-service/pid"
|
|
|
|
|
;; Allow time for migrations to run
|
|
|
|
|
#:pid-file-timeout 60
|
|
|
|
|
#:environment-variables
|
|
|
|
|
`(,(string-append
|
|
|
|
|
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
2020-10-08 15:21:02 -04:00
|
|
|
|
"LC_ALL=en_US.UTF-8")
|
2019-09-15 14:16:11 -04:00
|
|
|
|
#:log-file "/var/log/guix-data-service/web.log"))
|
|
|
|
|
(stop #~(make-kill-destructor)))
|
|
|
|
|
|
|
|
|
|
(shepherd-service
|
|
|
|
|
(documentation "Guix Data Service process jobs")
|
|
|
|
|
(provision '(guix-data-service-process-jobs))
|
|
|
|
|
(requirement '(postgres
|
|
|
|
|
networking
|
|
|
|
|
;; Require guix-data-service, as that the database
|
|
|
|
|
;; migrations are handled through this service
|
|
|
|
|
guix-data-service))
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
(list
|
|
|
|
|
#$(file-append package
|
2020-03-01 15:56:37 -05:00
|
|
|
|
"/bin/guix-data-service-process-jobs")
|
|
|
|
|
#$@extra-process-jobs-options)
|
2019-09-15 14:16:11 -04:00
|
|
|
|
#:user #$user
|
|
|
|
|
#:group #$group
|
|
|
|
|
#:environment-variables
|
|
|
|
|
`("HOME=/var/lib/guix-data-service"
|
|
|
|
|
"GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
|
|
|
|
|
,(string-append
|
|
|
|
|
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
2020-10-08 15:21:02 -04:00
|
|
|
|
"LC_ALL=en_US.UTF-8")
|
2019-09-15 14:16:11 -04:00
|
|
|
|
#:log-file "/var/log/guix-data-service/process-jobs.log"))
|
|
|
|
|
(stop #~(make-kill-destructor))))))
|
|
|
|
|
|
|
|
|
|
(define (guix-data-service-activation config)
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
|
|
|
|
|
(define %user (getpw "guix-data-service"))
|
|
|
|
|
|
|
|
|
|
(chmod "/var/lib/guix-data-service" #o755)
|
|
|
|
|
|
|
|
|
|
(mkdir-p "/var/log/guix-data-service")
|
|
|
|
|
|
|
|
|
|
;; Allow writing the PID file
|
|
|
|
|
(mkdir-p "/var/run/guix-data-service")
|
|
|
|
|
(chown "/var/run/guix-data-service"
|
|
|
|
|
(passwd:uid %user)
|
|
|
|
|
(passwd:gid %user))))
|
|
|
|
|
|
|
|
|
|
(define (guix-data-service-account config)
|
|
|
|
|
(match-record config <guix-data-service-configuration>
|
|
|
|
|
(user group)
|
|
|
|
|
(list (user-group
|
|
|
|
|
(name group)
|
|
|
|
|
(system? #t))
|
|
|
|
|
(user-account
|
|
|
|
|
(name user)
|
|
|
|
|
(group group)
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "Guix Data Service user")
|
|
|
|
|
(home-directory "/var/lib/guix-data-service")
|
|
|
|
|
(shell (file-append shadow "/sbin/nologin"))))))
|
|
|
|
|
|
|
|
|
|
(define (guix-data-service-getmail-configuration config)
|
|
|
|
|
(match config
|
|
|
|
|
(($ <guix-data-service-configuration> package user group
|
|
|
|
|
port host
|
|
|
|
|
#f #f)
|
|
|
|
|
'())
|
|
|
|
|
(($ <guix-data-service-configuration> package user group
|
|
|
|
|
port host
|
|
|
|
|
getmail-idle-mailboxes
|
|
|
|
|
commits-getmail-retriever-configuration)
|
|
|
|
|
(list
|
|
|
|
|
(getmail-configuration
|
|
|
|
|
(name 'guix-data-service)
|
|
|
|
|
(user user)
|
|
|
|
|
(group group)
|
|
|
|
|
(directory "/var/lib/getmail/guix-data-service")
|
|
|
|
|
(rcfile
|
|
|
|
|
(getmail-configuration-file
|
|
|
|
|
(retriever commits-getmail-retriever-configuration)
|
|
|
|
|
(destination
|
|
|
|
|
(getmail-destination-configuration
|
|
|
|
|
(type "MDA_external")
|
|
|
|
|
(path (file-append
|
|
|
|
|
package
|
|
|
|
|
"/bin/guix-data-service-process-branch-updated-email"))))
|
|
|
|
|
(options
|
|
|
|
|
(getmail-options-configuration
|
|
|
|
|
(read-all #f)
|
|
|
|
|
(delivered-to #f)
|
|
|
|
|
(received #f)))))
|
|
|
|
|
(idle getmail-idle-mailboxes))))))
|
|
|
|
|
|
|
|
|
|
(define guix-data-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'guix-data-service)
|
|
|
|
|
(extensions
|
|
|
|
|
(list
|
|
|
|
|
(service-extension profile-service-type
|
|
|
|
|
guix-data-service-profile-packages)
|
|
|
|
|
(service-extension shepherd-root-service-type
|
|
|
|
|
guix-data-service-shepherd-services)
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
guix-data-service-activation)
|
|
|
|
|
(service-extension account-service-type
|
|
|
|
|
guix-data-service-account)
|
|
|
|
|
(service-extension getmail-service-type
|
|
|
|
|
guix-data-service-getmail-configuration)))
|
|
|
|
|
(default-value
|
|
|
|
|
(guix-data-service-configuration))
|
|
|
|
|
(description
|
|
|
|
|
"Run an instance of the Guix Data Service.")))
|