rework and reformating of services

This commit is contained in:
Jean-François GUILLAUME 2022-11-24 15:00:33 +01:00
parent c7178062a0
commit ea3c876afc
GPG key ID: 38751DAE145EFB5A
7 changed files with 548 additions and 701 deletions

View file

@ -18,14 +18,14 @@
<sssd-configuration> <sssd-configuration>
sssd-configuration make-sssd-configuration sssd-configuration? sssd-configuration make-sssd-configuration sssd-configuration?
(sssd-pkg sssd-pkg (default sssd)) (sssd-pkg sssd-pkg (default sssd))
(sssd-conf sssd-conf (default "/etc/sssd/sssd.conf")) (sssd-config-file sssd-config-file (default "/etc/sssd/sssd.conf"))
(sssd-logger sssd-logger (default "stderr")) (sssd-logger sssd-logger (default "stderr"))
(sssd-debug-level sssd-debug-level (default "3")) (sssd-debug-level sssd-debug-level (default "3"))
(log-file log-file (default "/var/log/sssd/sssd.log"))) (log-file log-file (default "/var/log/sssd/sssd.log")))
(define sssd-service (define sssd-service
(match-lambda (match-lambda
(($ <sssd-configuration> sssd-pkg sssd-conf sssd-logger sssd-debug-level log-file) (($ <sssd-configuration> sssd-pkg sssd-config-file sssd-logger sssd-debug-level log-file)
(list (list
(shepherd-service (shepherd-service
(provision '(sssd)) (provision '(sssd))
@ -36,7 +36,7 @@
(list (list
#$(file-append sssd-pkg "/sbin/sssd") #$(file-append sssd-pkg "/sbin/sssd")
"-i" "-i"
"-c" #$sssd-conf "-c" #$sssd-config-file
"--logger" #$sssd-logger "--logger" #$sssd-logger
"-d" #$sssd-debug-level "-d" #$sssd-debug-level
) )

View file

@ -1,430 +1,397 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;;
;;; 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 (glicid services cuirass) (define-module (glicid services cuirass)
#:use-module (guix channels) #:use-module (guix channels)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages ci) #:use-module (gnu packages ci)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services base) #:use-module (gnu services base)
#:use-module (gnu services databases) #:use-module (gnu services databases)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu services admin) #:use-module (gnu services admin)
#:use-module (gnu system shadow) #:use-module (gnu system shadow)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:export (cuirass-remote-server-configuration #:export (cuirass-remote-server-configuration
cuirass-remote-server-configuration? cuirass-remote-server-configuration?
cuirass-configuration cuirass-configuration
cuirass-configuration? cuirass-configuration?
cuirass-service-type cuirass-service-type
cuirass-remote-worker-configuration cuirass-remote-worker-configuration
cuirass-remote-worker-configuration? cuirass-remote-worker-configuration?
cuirass-remote-worker-service-type)) cuirass-remote-worker-service-type))
;;;; Commentary: (define %cuirass-default-database "dbname=cuirass")
;;;
;;; This module implements a service that to run instances of Cuirass, a
;;; continuous integration tool.
;;;
;;;; Code:
(define %cuirass-default-database
"dbname=cuirass")
(define-record-type* <cuirass-remote-server-configuration> (define-record-type* <cuirass-remote-server-configuration>
cuirass-remote-server-configuration make-cuirass-remote-server-configuration cuirass-remote-server-configuration make-cuirass-remote-server-configuration
cuirass-remote-server-configuration? cuirass-remote-server-configuration?
(backend-port cuirass-remote-server-configuration-backend-port ;int (backend-port cuirass-remote-server-configuration-backend-port ;int
(default 5555)) (default 5555))
(log-port cuirass-remote-server-configuration-log-port ;int (log-port cuirass-remote-server-configuration-log-port ;int
(default 5556)) (default 5556))
(publish-port cuirass-remote-server-configuration-publish-port ;int (publish-port cuirass-remote-server-configuration-publish-port ;int
(default 5557)) (default 5557))
(log-file cuirass-remote-server-log-file ;string (log-file cuirass-remote-server-log-file ;string
(default "/var/log/cuirass-remote-server.log")) (default "/var/log/cuirass-remote-server.log"))
(cache cuirass-remote-server-configuration-cache ;string (cache cuirass-remote-server-configuration-cache ;string
(default "/var/cache/cuirass/remote/")) (default "/var/cache/cuirass/remote/"))
(publish? cuirass-remote-server-configuration-publish? ;boolean (publish? cuirass-remote-server-configuration-publish? ;boolean
(default #t)) (default #t))
(trigger-url cuirass-remote-server-trigger-url ;string (trigger-url cuirass-remote-server-trigger-url ;string
(default #f)) (default #f))
(public-key cuirass-remote-server-configuration-public-key ;string (public-key cuirass-remote-server-configuration-public-key ;string
(default #f)) (default #f))
(private-key cuirass-remote-server-configuration-private-key ;string (private-key cuirass-remote-server-configuration-private-key ;string
(default #f))) (default #f)))
(define-record-type* <cuirass-configuration> (define-record-type* <cuirass-configuration>
cuirass-configuration make-cuirass-configuration cuirass-configuration make-cuirass-configuration
cuirass-configuration? cuirass-configuration?
(cuirass cuirass-configuration-cuirass ;file-like (cuirass cuirass-configuration-cuirass ;file-like
(default cuirass)) (default cuirass))
(log-file cuirass-configuration-log-file ;string (log-file cuirass-configuration-log-file ;string
(default "/var/log/cuirass.log")) (default "/var/log/cuirass.log"))
(web-log-file cuirass-configuration-web-log-file ;string (web-log-file cuirass-configuration-web-log-file ;string
(default "/var/log/cuirass-web.log")) (default "/var/log/cuirass-web.log"))
(cache-directory cuirass-configuration-cache-directory ;string (dir-name) (cache-directory cuirass-configuration-cache-directory ;string (dir-name)
(default "/var/cache/cuirass")) (default "/var/cache/cuirass"))
(user cuirass-configuration-user ;string (user cuirass-configuration-user ;string
(default "cuirass")) (default "cuirass"))
(group cuirass-configuration-group ;string (group cuirass-configuration-group ;string
(default "cuirass")) (default "cuirass"))
(interval cuirass-configuration-interval ;integer (seconds) (interval cuirass-configuration-interval ;integer (seconds)
(default 60)) (default 60))
(parameters cuirass-configuration-parameters ;string (parameters cuirass-configuration-parameters ;string
(default #f)) (default #f))
(remote-server cuirass-configuration-remote-server (remote-server cuirass-configuration-remote-server
(default #f)) (default #f))
(database cuirass-configuration-database ;string (database cuirass-configuration-database ;string
(default %cuirass-default-database)) (default %cuirass-default-database))
(port cuirass-configuration-port ;integer (port) (port cuirass-configuration-port ;integer (port)
(default 8081)) (default 8081))
(host cuirass-configuration-host ;string (host cuirass-configuration-host ;string
(default "localhost")) (default "localhost"))
(specifications cuirass-configuration-specifications) (specifications cuirass-configuration-specifications)
;gexp that evaluates to specification-alist ;gexp that evaluates to specification-alist
(use-substitutes? cuirass-configuration-use-substitutes? ;boolean (use-substitutes? cuirass-configuration-use-substitutes? ;boolean
(default #f)) (default #f))
(one-shot? cuirass-configuration-one-shot? ;boolean (one-shot? cuirass-configuration-one-shot? ;boolean
(default #f)) (default #f))
(fallback? cuirass-configuration-fallback? ;boolean (fallback? cuirass-configuration-fallback? ;boolean
(default #f)) (default #f))
(extra-options cuirass-configuration-extra-options (extra-options cuirass-configuration-extra-options
(default '())) (default '()))
(http-proxy cuirass-configuration-http-proxy ;string (http-proxy cuirass-configuration-http-proxy ;string
(default "")) (default ""))
(https-proxy cuirass-configuration-https-proxy ;string (https-proxy cuirass-configuration-https-proxy ;string
(default "")) (default ""))
) )
(define (cuirass-shepherd-service config) (define (cuirass-shepherd-service config)
"Return a <shepherd-service> for the Cuirass service with CONFIG." "Return a <shepherd-service> for the Cuirass service with CONFIG."
(let ((cuirass (cuirass-configuration-cuirass config)) (let ((cuirass (cuirass-configuration-cuirass config))
(cache-directory (cuirass-configuration-cache-directory config)) (cache-directory (cuirass-configuration-cache-directory config))
(web-log-file (cuirass-configuration-web-log-file config)) (web-log-file (cuirass-configuration-web-log-file config))
(log-file (cuirass-configuration-log-file config)) (log-file (cuirass-configuration-log-file config))
(user (cuirass-configuration-user config)) (user (cuirass-configuration-user config))
(group (cuirass-configuration-group config)) (group (cuirass-configuration-group config))
(interval (cuirass-configuration-interval config)) (interval (cuirass-configuration-interval config))
(parameters (cuirass-configuration-parameters config)) (parameters (cuirass-configuration-parameters config))
(remote-server (cuirass-configuration-remote-server config)) (remote-server (cuirass-configuration-remote-server config))
(database (cuirass-configuration-database config)) (database (cuirass-configuration-database config))
(port (cuirass-configuration-port config)) (port (cuirass-configuration-port config))
(host (cuirass-configuration-host config)) (host (cuirass-configuration-host config))
(specs (cuirass-configuration-specifications config)) (specs (cuirass-configuration-specifications config))
(use-substitutes? (cuirass-configuration-use-substitutes? config)) (use-substitutes? (cuirass-configuration-use-substitutes? config))
(one-shot? (cuirass-configuration-one-shot? config)) (one-shot? (cuirass-configuration-one-shot? config))
(fallback? (cuirass-configuration-fallback? config)) (fallback? (cuirass-configuration-fallback? config))
(extra-options (cuirass-configuration-extra-options config)) (extra-options (cuirass-configuration-extra-options config))
(http-proxy (cuirass-configuration-http-proxy config)) (http-proxy (cuirass-configuration-http-proxy config))
(https-proxy (cuirass-configuration-https-proxy config))) (https-proxy (cuirass-configuration-https-proxy config)))
`(,(shepherd-service `(,(shepherd-service
(documentation "Run Cuirass.") (documentation "Run Cuirass.")
(provision '(cuirass)) (provision '(cuirass))
(requirement '(guix-daemon postgres postgres-roles networking)) (requirement '(guix-daemon postgres postgres-roles networking))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (string-append #$cuirass "/bin/cuirass") (list (string-append #$cuirass "/bin/cuirass")
"register" "register"
"--cache-directory" #$cache-directory "--cache-directory" #$cache-directory
"--specifications" "--specifications"
#$(scheme-file "cuirass-specs.scm" specs) #$(scheme-file "cuirass-specs.scm" specs)
"--database" #$database "--database" #$database
"--interval" #$(number->string interval) "--interval" #$(number->string interval)
#$@(if parameters #$@(if parameters
(list (string-append (list (string-append
"--parameters=" "--parameters="
parameters)) parameters))
'()) '())
#$@(if remote-server '("--build-remote") '()) #$@(if remote-server '("--build-remote") '())
#$@(if use-substitutes? '("--use-substitutes") '()) #$@(if use-substitutes? '("--use-substitutes") '())
#$@(if one-shot? '("--one-shot") '()) #$@(if one-shot? '("--one-shot") '())
#$@(if fallback? '("--fallback") '()) #$@(if fallback? '("--fallback") '())
#$@extra-options) #$@extra-options)
#:environment-variables #:environment-variables
(list (list
"GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt" "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
(string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core") (string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core")
(string-append "http_proxy=" #$http-proxy) (string-append "http_proxy=" #$http-proxy)
(string-append "https_proxy=" #$http-proxy) (string-append "https_proxy=" #$http-proxy)
;"http_proxy=http://proxy-upgrade.univ-nantes.prive:3128/" ;"http_proxy=http://proxy-upgrade.univ-nantes.prive:3128/"
;"https_proxy=http://proxy-upgrade.univ-nantes.prive:3128/" ;"https_proxy=http://proxy-upgrade.univ-nantes.prive:3128/"
) )
#:user #$user #:user #$user
#:group #$group #:group #$group
#:log-file #$log-file)) #:log-file #$log-file))
(stop #~(make-kill-destructor))) (stop #~(make-kill-destructor)))
,(shepherd-service ,(shepherd-service
(documentation "Run Cuirass web interface.") (documentation "Run Cuirass web interface.")
(provision '(cuirass-web)) (provision '(cuirass-web))
(requirement '(cuirass)) (requirement '(cuirass))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (string-append #$cuirass "/bin/cuirass") (list (string-append #$cuirass "/bin/cuirass")
"web" "web"
"--database" #$database "--database" #$database
"--listen" #$host "--listen" #$host
"--port" #$(number->string port) "--port" #$(number->string port)
#$@(if parameters #$@(if parameters
(list (string-append (list (string-append
"--parameters=" "--parameters="
parameters)) parameters))
'()) '())
#$@extra-options) #$@extra-options)
#:user #$user #:user #$user
#:group #$group #:group #$group
#:log-file #$web-log-file)) #:log-file #$web-log-file))
(stop #~(make-kill-destructor))) (stop #~(make-kill-destructor)))
,@(if remote-server ,@(if remote-server
(match-record remote-server <cuirass-remote-server-configuration> (match-record remote-server <cuirass-remote-server-configuration>
(backend-port publish-port log-file cache publish? (backend-port publish-port log-file cache publish?
trigger-url public-key private-key) trigger-url public-key private-key)
(list (list
(shepherd-service (shepherd-service
(documentation "Run Cuirass remote build server.") (documentation "Run Cuirass remote build server.")
(provision '(cuirass-remote-server)) (provision '(cuirass-remote-server))
(requirement '(avahi-daemon cuirass)) (requirement '(avahi-daemon cuirass))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (string-append #$cuirass "/bin/cuirass") (list (string-append #$cuirass "/bin/cuirass")
"remote-server" "remote-server"
(string-append "--database=" #$database) (string-append "--database=" #$database)
(string-append "--cache=" #$cache) (string-append "--cache=" #$cache)
(string-append "--user=" #$user) (string-append "--user=" #$user)
#$@(if backend-port #$@(if backend-port
(list (string-append (list (string-append
"--backend-port=" "--backend-port="
(number->string backend-port))) (number->string backend-port)))
'()) '())
#$@(if publish-port #$@(if publish-port
(list (string-append (list (string-append
"--publish-port=" "--publish-port="
(number->string publish-port))) (number->string publish-port)))
'()) '())
#$@(if parameters #$@(if parameters
(list (string-append (list (string-append
"--parameters=" "--parameters="
parameters)) parameters))
'()) '())
#$@(if trigger-url #$@(if trigger-url
(list (list
(string-append (string-append
"--trigger-substitute-url=" "--trigger-substitute-url="
trigger-url)) trigger-url))
'()) '())
#$@(if publish? #$@(if publish?
'() '()
(list "--no-publish")) (list "--no-publish"))
#$@(if public-key #$@(if public-key
(list (list
(string-append "--public-key=" (string-append "--public-key="
public-key)) public-key))
'()) '())
#$@(if private-key #$@(if private-key
(list (list
(string-append "--private-key=" (string-append "--private-key="
private-key)) private-key))
'())) '()))
#:environment-variables #:environment-variables
(list (list
"GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt" "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
(string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core") (string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core")
(string-append "http_proxy=" #$http-proxy) (string-append "http_proxy=" #$http-proxy)
(string-append "https_proxy=" #$http-proxy) (string-append "https_proxy=" #$http-proxy)
) )
#:log-file #$log-file)) #:log-file #$log-file))
(stop #~(make-kill-destructor))))) (stop #~(make-kill-destructor)))))
'())))) '()))))
(define (cuirass-account config) (define (cuirass-account config)
"Return the user accounts and user groups for CONFIG." "Return the user accounts and user groups for CONFIG."
(let ((cuirass-user (cuirass-configuration-user config)) (let ((cuirass-user (cuirass-configuration-user config))
(cuirass-group (cuirass-configuration-group config))) (cuirass-group (cuirass-configuration-group config)))
(list (user-group (list (user-group
(name cuirass-group) (name cuirass-group)
(system? #t)) (system? #t))
(user-account (user-account
(name cuirass-user) (name cuirass-user)
(group cuirass-group) (group cuirass-group)
(system? #t) (system? #t)
(comment "Cuirass privilege separation user") (comment "Cuirass privilege separation user")
(home-directory (string-append "/var/lib/" cuirass-user)) (home-directory (string-append "/var/lib/" cuirass-user))
(shell (file-append shadow "/sbin/nologin")))))) (shell (file-append shadow "/sbin/nologin"))))))
(define (cuirass-postgresql-role config) (define (cuirass-postgresql-role config)
(let ((user (cuirass-configuration-user config))) (let ((user (cuirass-configuration-user config)))
(list (postgresql-role (list (postgresql-role
(name user) (name user)
(create-database? #t))))) (create-database? #t)))))
(define (cuirass-activation config) (define (cuirass-activation config)
"Return the activation code for CONFIG." "Return the activation code for CONFIG."
(let* ((cache (cuirass-configuration-cache-directory config)) (let* ((cache (cuirass-configuration-cache-directory config))
(remote-server (cuirass-configuration-remote-server config)) (remote-server (cuirass-configuration-remote-server config))
(remote-cache (and remote-server (remote-cache (and remote-server
(cuirass-remote-server-configuration-cache (cuirass-remote-server-configuration-cache
remote-server))) remote-server)))
(user (cuirass-configuration-user config)) (user (cuirass-configuration-user config))
(log "/var/log/cuirass") (log "/var/log/cuirass")
(profile (string-append "/var/guix/profiles/per-user/" user)) (profile (string-append "/var/guix/profiles/per-user/" user))
(roots (string-append profile "/cuirass")) (roots (string-append profile "/cuirass"))
(group (cuirass-configuration-group config))) (group (cuirass-configuration-group config)))
(with-imported-modules '((guix build utils)) (with-imported-modules '((guix build utils))
#~(begin #~(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
(mkdir-p #$cache) (mkdir-p #$cache)
(mkdir-p #$log) (mkdir-p #$log)
(mkdir-p #$roots) (mkdir-p #$roots)
(when #$remote-cache (when #$remote-cache
(mkdir-p #$remote-cache)) (mkdir-p #$remote-cache))
(let ((uid (passwd:uid (getpw #$user))) (let ((uid (passwd:uid (getpw #$user)))
(gid (group:gid (getgr #$group)))) (gid (group:gid (getgr #$group))))
(chown #$cache uid gid) (chown #$cache uid gid)
(chown #$log uid gid) (chown #$log uid gid)
(chown #$roots uid gid) (chown #$roots uid gid)
(chown #$profile uid gid) (chown #$profile uid gid)
(when #$remote-cache (when #$remote-cache
(chown #$remote-cache uid gid))))))) (chown #$remote-cache uid gid)))))))
(define (cuirass-log-rotations config) (define (cuirass-log-rotations config)
"Return the list of log rotations that corresponds to CONFIG." "Return the list of log rotations that corresponds to CONFIG."
(list (log-rotation (list (log-rotation
(files (list (cuirass-configuration-log-file config) (files (list (cuirass-configuration-log-file config)
(cuirass-configuration-web-log-file config))) (cuirass-configuration-web-log-file config)))
(frequency 'weekly) (frequency 'weekly)
(options '("rotate 40"))))) ;worth keeping (options '("rotate 40"))))) ;worth keeping
(define cuirass-service-type (define cuirass-service-type
(service-type (service-type
(name 'cuirass) (name 'cuirass)
(extensions (extensions
(list (list
(service-extension profile-service-type ;for 'info cuirass' (service-extension profile-service-type ;for 'info cuirass'
(compose list cuirass-configuration-cuirass)) (compose list cuirass-configuration-cuirass))
(service-extension rottlog-service-type cuirass-log-rotations) (service-extension rottlog-service-type cuirass-log-rotations)
(service-extension activation-service-type cuirass-activation) (service-extension activation-service-type cuirass-activation)
(service-extension shepherd-root-service-type cuirass-shepherd-service) (service-extension shepherd-root-service-type cuirass-shepherd-service)
(service-extension account-service-type cuirass-account) (service-extension account-service-type cuirass-account)
;; Make sure postgresql and postgresql-role are instantiated. ;; Make sure postgresql and postgresql-role are instantiated.
(service-extension postgresql-service-type (const #t)) (service-extension postgresql-service-type (const #t))
(service-extension postgresql-role-service-type (service-extension postgresql-role-service-type
cuirass-postgresql-role))) cuirass-postgresql-role)))
(description (description
"Run the Cuirass continuous integration service."))) "Run the Cuirass continuous integration service.")))
(define-record-type* <cuirass-remote-worker-configuration> (define-record-type* <cuirass-remote-worker-configuration>
cuirass-remote-worker-configuration make-cuirass-remote-worker-configuration cuirass-remote-worker-configuration make-cuirass-remote-worker-configuration
cuirass-remote-worker-configuration? cuirass-remote-worker-configuration?
(cuirass cuirass-remote-worker-configuration-cuirass ;file-like (cuirass cuirass-remote-worker-configuration-cuirass ;file-like
(default cuirass)) (default cuirass))
(workers cuirass-remote-worker-workers ;int (workers cuirass-remote-worker-workers ;int
(default 1)) (default 1))
(server cuirass-remote-worker-server ;string (server cuirass-remote-worker-server ;string
(default #f)) (default #f))
(systems cuirass-remote-worker-systems ;list (systems cuirass-remote-worker-systems ;list
(default (list (%current-system)))) (default (list (%current-system))))
(log-file cuirass-remote-worker-log-file ;string (log-file cuirass-remote-worker-log-file ;string
(default "/var/log/cuirass-remote-worker.log")) (default "/var/log/cuirass-remote-worker.log"))
(publish-port cuirass-remote-worker-configuration-publish-port ;int (publish-port cuirass-remote-worker-configuration-publish-port ;int
(default 5558)) (default 5558))
(substitute-urls cuirass-remote-worker-configuration-substitute-urls (substitute-urls cuirass-remote-worker-configuration-substitute-urls
(default %default-substitute-urls)) ;list of strings (default %default-substitute-urls)) ;list of strings
(public-key cuirass-remote-worker-configuration-public-key ;string (public-key cuirass-remote-worker-configuration-public-key ;string
(default #f)) (default #f))
(private-key cuirass-remote-worker-configuration-private-key ;string (private-key cuirass-remote-worker-configuration-private-key ;string
(default #f))) (default #f)))
(define (cuirass-remote-worker-shepherd-service config) (define (cuirass-remote-worker-shepherd-service config)
"Return a <shepherd-service> for the Cuirass remote worker service with "Return a <shepherd-service> for the Cuirass remote worker service with
CONFIG." CONFIG."
(match-record config <cuirass-remote-worker-configuration> (match-record config <cuirass-remote-worker-configuration>
(cuirass workers server systems log-file publish-port (cuirass workers server systems log-file publish-port
substitute-urls public-key private-key) substitute-urls public-key private-key)
(list (shepherd-service (list (shepherd-service
(documentation "Run Cuirass remote build worker.") (documentation "Run Cuirass remote build worker.")
(provision '(cuirass-remote-worker)) (provision '(cuirass-remote-worker))
(requirement '(avahi-daemon guix-daemon networking)) (requirement '(avahi-daemon guix-daemon networking))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (string-append #$cuirass "/bin/cuirass") (list (string-append #$cuirass "/bin/cuirass")
"remote-worker" "remote-worker"
(string-append "--workers=" (string-append "--workers="
#$(number->string workers)) #$(number->string workers))
#$@(if server #$@(if server
(list (string-append "--server=" server)) (list (string-append "--server=" server))
'()) '())
#$@(if systems #$@(if systems
(list (string-append (list (string-append
"--systems=" "--systems="
(string-join systems ","))) (string-join systems ",")))
'()) '())
#$@(if publish-port #$@(if publish-port
(list (string-append (list (string-append
"--publish-port=" "--publish-port="
(number->string publish-port))) (number->string publish-port)))
'()) '())
#$@(if substitute-urls #$@(if substitute-urls
(list (string-append (list (string-append
"--substitute-urls=" "--substitute-urls="
(string-join substitute-urls))) (string-join substitute-urls)))
'()) '())
#$@(if public-key #$@(if public-key
(list (list
(string-append "--public-key=" (string-append "--public-key="
public-key)) public-key))
'()) '())
#$@(if private-key #$@(if private-key
(list (list
(string-append "--private-key=" (string-append "--private-key="
private-key)) private-key))
'())) '()))
#:environment-variables #:environment-variables
(list (list
"GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt" "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
(string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core") (string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core")
(string-append "http_proxy=" #$http-proxy) (string-append "http_proxy=" #$http-proxy)
(string-append "https_proxy=" #$http-proxy) (string-append "https_proxy=" #$http-proxy)
) )
#:log-file #$log-file)) #:log-file #$log-file))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(define cuirass-remote-worker-service-type (define cuirass-remote-worker-service-type
(service-type (service-type
(name 'cuirass-remote-worker) (name 'cuirass-remote-worker)
(extensions (extensions (list
(list (service-extension shepherd-root-service-type
(service-extension shepherd-root-service-type cuirass-remote-worker-shepherd-service)))
cuirass-remote-worker-shepherd-service))) (description "Run the Cuirass remote build worker service.")))
(description
"Run the Cuirass remote build worker service.")))

View file

@ -1,73 +1,50 @@
(define-module (glicid services file-systems) (define-module (glicid services file-systems)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (guix) #:use-module (guix)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix records) #:use-module (guix records)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (gnu packages file-systems) #:use-module (gnu packages file-systems)
#:export ( #:export (
%default-autofs-conf %default-autofs-conf
autofs-configuration autofs-configuration
autofs-configuration? autofs-configuration?
autofs-service autofs-service
autofs-service-type autofs-service-type
) ))
)
(define %default-autofs-conf (define %default-autofs-conf
(plain-file "autofs" " (plain-file "autofs" "
# Empty file as we do nothing by default # Empty file as we do nothing by default
") "))
)
(define-record-type* <autofs-configuration> (define-record-type*
<autofs-configuration>
autofs-configuration make-autofs-configuration autofs-configuration make-autofs-configuration
autofs-configuration? autofs-configuration?
(autofs autofs-configuration-autofs (autofs-pkg autofs-pkg (default autofs))
(default autofs) (autofs-config-file autofs-config-file (default %default-autofs-conf))
) (log-file autofs-log-file (default "/var/log/autofs.log")))
(config-file autofs-config-file
(default %default-autofs-conf)
)
(log-file autofs-log-file
(default "/var/log/autofs.log")
)
)
(define autofs-service (define autofs-service
(match-lambda (match-lambda
(($ <autofs-configuration> autofs config-file log-file) (($ <autofs-configuration> autofs-pkg autofs-config-file log-file)
(list (list
(shepherd-service (shepherd-service
(provision '(autofs) ) (provision '(autofs))
(documentation "Run autofs.") (documentation "Run autofs.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append autofs "/sbin/automount") #$(file-append autofs-pkg "/sbin/automount") "-d" "-f")
"-d" "-f" #:log-file #$log-file
) ))
#:log-file #$log-file (stop #~(make-kill-destructor)))))))
))
(stop #~(make-kill-destructor))
)
)
)
)
)
(define autofs-service-type (define autofs-service-type
(service-type (name 'autofs) (service-type
(extensions (name 'autofs)
(list ( (extensions (list
service-extension (service-extension shepherd-root-service-type autofs-service)))
shepherd-root-service-type (description "Run autofs")))
autofs-service
))
)
(description "Run autofs")
)
)

View file

@ -1,98 +1,72 @@
(define-module (glicid services networking) (define-module (glicid services networking)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu system shadow) #:use-module (gnu system shadow)
#:use-module (guix) #:use-module (guix)
#:use-module (guix records) #:use-module (guix records)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#: export ( #: export (
squid-configuration squid-configuration
squid-configuration? squid-configuration?
squid-shepherd-service squid-shepherd-service
squid-service-type squid-service-type
) ))
)
(define-record-type* <squid-configuration> (define-record-type*
<squid-configuration>
squid-configuration make-squid-configuration squid-configuration make-squid-configuration
squid-configuration? squid-configuration?
(squid squid-configuration-squid (squid-pkg squid-pkg (default squid))
(default squid) (squid-port squid-port (default 3128))
(squid-loglevel squid-loglevel (default 1))
(squid-config-file squid-config-file (default (file-append squid "/etc/squid.conf")))
(pid-file squid-pid-file (default "/var/run/squid/squid.pid"))
(log-file squid-log-file (default "/var/log/squid/squid.log"))
) )
(port squid-configuration-port
(default 3128)
)
(loglevel squid-configuration-loglevel
(default 1)
)
(pid-file squid-configuration-pid-file
(default "/var/run/squid/squid.pid")
)
(config-file squid-configuration-config-file
(default (file-append squid "/etc/squid.conf"))
)
(log-file squid-configuration-log-file
(default "/var/log/squid/squid.log")
)
)
(define squid-shepherd-service (define squid-shepherd-service
(match-lambda (match-lambda
(($ <squid-configuration> squid port loglevel pid-file config-file log-file) (($ <squid-configuration> squid-pkg squid-port squid-loglevel squid-config-file pid-file log-file)
(list (list
(shepherd-service (shepherd-service
(provision '(squid) ) (provision '(squid))
(documentation "Run squid.") (documentation "Run squid.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append squid "/sbin/squid") #$(file-append squid-pkg "/sbin/squid")
"-f" #$config-file "-f" #$squid-config-file
) )
#:pid-file #$pid-file #:pid-file #$pid-file
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid (getpwnam "squid")) #:user (passwd:uid (getpwnam "squid"))
#:group (passwd:gid (getpwnam "squid")) #:group (passwd:gid (getpwnam "squid"))
#:resource-limits '((nofile 16384 16384)) #:resource-limits '((nofile 16384 16384))))
)) (stop #~(make-kill-destructor)))))))
(stop #~(make-kill-destructor))
)
)
)
)
)
(define %squid-activation (define %squid-activation
(with-imported-modules '((guix build utils)) #~(begin
#~(begin (mkdir-p "/var/run/squid")
(use-modules (guix build utils)) (mkdir-p "/var/log/squid")
(define (touch file-name) (mkdir-p "/var/cache/squid")
(call-with-output-file file-name (const #t)) (mkdir-p "/var/spool/squid")
) (touch "/var/log/squid/squid.log")
(mkdir-p "/var/run/squid") (touch "/var/log/squid/squid_access.log")
(mkdir-p "/var/log/squid") (touch "/var/log/squid/squid_cache.log")
(mkdir-p "/var/cache/squid") (touch "/var/log/squid/squid_cache_store.log")
(mkdir-p "/var/spool/squid") (chown "/var/run/squid" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
(touch "/var/log/squid/squid.log") (chown "/var/cache/squid" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
(touch "/var/log/squid/squid_access.log") (chown "/var/log/squid" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
(touch "/var/log/squid/squid_cache.log") (chown "/var/spool/squid" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
(touch "/var/log/squid/squid_cache_store.log") (chown "/var/log/squid/squid.log" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
(chown "/var/run/squid" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid"))) (chown "/var/log/squid/squid_access.log" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
(chown "/var/cache/squid" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid"))) (chown "/var/log/squid/squid_cache.log" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
(chown "/var/log/squid" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid"))) (chown "/var/log/squid/squid_cache_store.log" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
(chown "/var/spool/squid" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid"))) #t ))
(chown "/var/log/squid/squid.log" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
(chown "/var/log/squid/squid_access.log" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
(chown "/var/log/squid/squid_cache.log" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
(chown "/var/log/squid/squid_cache_store.log" (passwd:uid (getpwnam "squid")) (passwd:gid (getpwnam "squid")))
#t
)
)
)
(define %squid-accounts (define %squid-accounts
(list (list
@ -103,20 +77,13 @@
(system? #t) (system? #t)
(comment "Squid server user") (comment "Squid server user")
(home-directory "/var/spool/squid") (home-directory "/var/spool/squid")
(shell (file-append bash "/bin/bash")) (shell (file-append bash "/bin/bash")))))
)
)
)
(define squid-service-type (define squid-service-type
(service-type (name 'squid) (service-type
(extensions (name 'squid)
(list (extensions (list
(service-extension shepherd-root-service-type squid-shepherd-service) (service-extension shepherd-root-service-type squid-shepherd-service)
(service-extension activation-service-type (const %squid-activation)) (service-extension activation-service-type (const %squid-activation))
(service-extension account-service-type (const %squid-accounts)) (service-extension account-service-type (const %squid-accounts))))
) (description "Run @uref{http://www.squid-cache.org/, squid} community developped Squid software.")))
)
(description "Run @uref{http://www.squid-cache.org/, squid} community developped Squid software.")
)
)

View file

@ -1,87 +1,59 @@
(define-module (glicid services openldap) (define-module (glicid services openldap)
#:use-module (gnu packages openldap) #:use-module (gnu packages openldap)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (guix) #:use-module (guix)
#:use-module (guix records) #:use-module (guix records)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#: export ( #: export (
openldap-configuration openldap-configuration
openldap-configuration? openldap-configuration?
openldap-shepherd-service openldap-shepherd-service
openldap-service-type openldap-service-type
) ))
)
(define-record-type* <openldap-configuration> (define-record-type*
<openldap-configuration>
openldap-configuration make-openldap-configuration openldap-configuration make-openldap-configuration
openldap-configuration? openldap-configuration?
(openldap openldap-configuration-openldap (openldap-pkg openldap-pkg (default openldap))
(default openldap) (uri openldap-uri (default "ldapi:// ldap://"))
) (logflags openldap-logflags (default "0"))
(uri openldap-configuration-uri (pid-file openldap-pid-file (default "/var/run/openldap/slapd.pid"))
(default "ldapi:// ldap://") (config-file openldap--config-file (default (file-append openldap "/etc/openldap/slapd.conf")))
) (log-file openldap-log-file (default "/var/log/slapd.log")))
(logflags openldap-configuration-logflags
(default "0")
)
(pid-file openldap-configuration-pid-file
(default "/var/run/openldap/slapd.pid")
)
(config-file openldap-configuration-config-file
(default (file-append openldap "/etc/openldap/slapd.conf"))
)
(log-file openldap-configuration-log-file
(default "/var/log/slapd.log")
)
)
(define openldap-shepherd-service (define openldap-shepherd-service
(match-lambda (match-lambda
(($ <openldap-configuration> openldap uri logflags pid-file config-file log-file) (($ <openldap-configuration> openldap-pkg uri logflags pid-file config-file log-file)
(list (list
(shepherd-service (shepherd-service
(provision '(slapd) ) (provision '(slapd))
(documentation "Run openldap.") (documentation "Run openldap.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append openldap "/libexec/slapd") #$(file-append openldap "/libexec/slapd")
"-h" #$uri "-h" #$uri
"-d" #$logflags "-d" #$logflags
"-f" #$config-file "-f" #$config-file
) )
#:pid-file #$pid-file #:pid-file #$pid-file
#:log-file #$log-file #:log-file #$log-file ))
)) (stop #~(make-kill-destructor)))))))
(stop #~(make-kill-destructor))
)
)
)
)
)
(define %openldap-activation (define %openldap-activation
(with-imported-modules '((guix build utils)) #~(begin
#~(begin (mkdir-p "/var/run/openldap")
(use-modules (guix build utils)) (mkdir-p "/var/lib/ldap")
(mkdir-p "/var/run/openldap") #t ))
(mkdir-p "/var/lib/ldap")
#t
)
)
)
(define openldap-service-type (define openldap-service-type
(service-type (name 'slapd) (service-type
(extensions (name 'slapd)
(list (extensions (list
(service-extension shepherd-root-service-type openldap-shepherd-service) (service-extension shepherd-root-service-type openldap-shepherd-service)
(service-extension activation-service-type (const %openldap-activation)) (service-extension activation-service-type (const %openldap-activation))))
) (description "Run @uref{https://www.openldap.org, Openldap} community developped LDAP software.")))
)
(description "Run @uref{https://www.openldap.org, Openldap} community developped LDAP software.")
)
)

View file

@ -70,12 +70,9 @@
(define munged-service-type (define munged-service-type
(service-type (service-type
(name 'munged) (name 'munged)
(extensions (extensions (list
(list (service-extension shepherd-root-service-type munged-service)
(service-extension shepherd-root-service-type munged-service) (service-extension activation-service-type (const %munged-activation)) ) )
(service-extension activation-service-type (const %munged-activation))
)
)
(description "Run munged"))) (description "Run munged")))
; ;
@ -150,13 +147,10 @@
(define slurmdbd-service-type (define slurmdbd-service-type
(service-type (service-type
(name 'slurmdbd) (name 'slurmdbd)
(extensions (extensions (list
(list (service-extension shepherd-root-service-type slurmdbd-service)
(service-extension shepherd-root-service-type slurmdbd-service) (service-extension activation-service-type (const %slurmdbd-activation))
(service-extension activation-service-type (const %slurmdbd-activation)) (service-extension account-service-type (const %slurm-accounts)) ) )
(service-extension account-service-type (const %slurm-accounts))
)
)
(description "Run slurmdbd"))) (description "Run slurmdbd")))
; ;
@ -216,13 +210,10 @@
(define slurmctld-service-type (define slurmctld-service-type
(service-type (service-type
(name 'slurmctld) (name 'slurmctld)
(extensions (extensions (list
(list (service-extension shepherd-root-service-type slurmctld-service)
(service-extension shepherd-root-service-type slurmctld-service) (service-extension activation-service-type (const %slurmctld-activation))
(service-extension activation-service-type (const %slurmctld-activation)) (service-extension account-service-type (const %slurm-accounts)) ) )
(service-extension account-service-type (const %slurm-accounts))
)
)
(description "Run slurmctld"))) (description "Run slurmctld")))
; ;
@ -280,11 +271,8 @@
(define slurmd-service-type (define slurmd-service-type
(service-type (service-type
(name 'slurmd) (name 'slurmd)
(extensions (extensions (list
(list (service-extension shepherd-root-service-type slurmd-service)
(service-extension shepherd-root-service-type slurmd-service) (service-extension activation-service-type (const %slurmd-activation))
(service-extension activation-service-type (const %slurmd-activation)) (service-extension account-service-type (const %slurm-accounts)) ) )
(service-extension account-service-type (const %slurm-accounts))
)
)
(description "Run slurmd"))) (description "Run slurmd")))

View file

@ -1,71 +1,47 @@
(define-module (glicid services rc-local) (define-module (glicid services rc-local)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (guix) #:use-module (guix)
#:use-module (guix records) #:use-module (guix records)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:export ( #:export (
%default-rc-local-conf %default-rc-local-conf
rc-local-configuration rc-local-configuration
rc-local-configuration? rc-local-configuration?
rc-local-service rc-local-service
rc-local-service-type rc-local-service-type))
)
)
(define %default-rc-local-conf (define %default-rc-local-conf
(plain-file "rc-local" " (plain-file "rc-local" "
# Empty file as we do nothing by default # Empty file as we do nothing by default
") "))
)
(define-record-type* <rc-local-configuration> (define-record-type*
<rc-local-configuration>
rc-local-configuration make-rc-local-configuration rc-local-configuration make-rc-local-configuration
rc-local-configuration? rc-local-configuration?
(config-file rc-local-config-file (config-file rc-local-config-file (default %default-rc-local-conf))
(default %default-rc-local-conf) (log-file log-file (default "/var/log/rc-local.log")))
)
(log-file rc-local-log-file
(default "/var/log/rc-local.log")
)
)
(define rc-local-service (define rc-local-service
(match-lambda (match-lambda
(($ <rc-local-configuration> config-file log-file) (($ <rc-local-configuration> config-file log-file)
(list (list
(shepherd-service (shepherd-service
(provision '(rc-local) ) (provision '(rc-local))
(documentation "Run rc-local.") (documentation "Run rc-local.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #f) (respawn? #f)
(one-shot? #t) (one-shot? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list #$(file-append bash "/bin/bash") "-l" #$config-file)
#$(file-append bash "/bin/bash") #:log-file #$log-file ))
"-l" (stop #~(make-kill-destructor)))))))
#$config-file
)
#:log-file #$log-file
))
(stop #~(make-kill-destructor))
)
)
)
)
)
(define rc-local-service-type (define rc-local-service-type
(service-type (name 'rc-local) (service-type
(extensions (name 'rc-local)
(list ( (extensions (list (service-extension shepherd-root-service-type rc-local-service)))
service-extension (description "Run a script in a rc-local like form")))
shepherd-root-service-type
rc-local-service
))
)
(description "Run a script in a rc-local like form")
)
)