never use guix reformater again

This commit is contained in:
Jean-François GUILLAUME 2023-01-10 11:17:38 +01:00
parent c221ef4185
commit 5d77b3c76a
GPG key ID: 38751DAE145EFB5A

View file

@ -34,12 +34,9 @@
(define-record-type* <munged-configuration> munged-configuration (define-record-type* <munged-configuration> munged-configuration
make-munged-configuration make-munged-configuration
munged-configuration? munged-configuration?
(munge munge-configuration-munge (munge munge-configuration-munge (default munge))
(default munge)) (key-file munged-key-file (default (file-append munge "/etc/munge/munged.key")))
(key-file munged-key-file (log-file munged-log-file (default "/var/log/munged.log")))
(default (file-append munge "/etc/munge/munged.key")))
(log-file munged-log-file
(default "/var/log/munged.log")))
(define munged-service (define munged-service
(match-lambda (match-lambda
@ -48,12 +45,9 @@
(documentation "Run munged.") (documentation "Run munged.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (list #$(file-append (start #~(make-forkexec-constructor (list #$(file-append munge "/sbin/munged")
munge
"/sbin/munged")
"-F" "-f" "-F" "-f"
"--key-file" "--key-file" #$key-file)
#$key-file)
#:log-file #$log-file)) #:log-file #$log-file))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
@ -64,10 +58,8 @@
(define munged-service-type (define munged-service-type
(service-type (name 'munged) (service-type (name 'munged)
(extensions (list (service-extension (extensions (list (service-extension shepherd-root-service-type munged-service)
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")))
; ;
@ -97,12 +89,9 @@
(define-record-type* <slurmdbd-configuration> slurmdbd-configuration (define-record-type* <slurmdbd-configuration> slurmdbd-configuration
make-slurmdbd-configuration make-slurmdbd-configuration
slurmdbd-configuration? slurmdbd-configuration?
(slurm slurm (slurm slurm (default slurm))
(default slurm)) (slurmdbd-conf slurmdbd-conf (default (file-append slurm "/etc/slurm/slurmdbd.conf")))
(slurmdbd-conf slurmdbd-conf (log-file log-file (default "/var/log/slurm/slurmdbd.log")))
(default (file-append slurm "/etc/slurm/slurmdbd.conf")))
(log-file log-file
(default "/var/log/slurm/slurmdbd.log")))
(define slurmdbd-service (define slurmdbd-service
(match-lambda (match-lambda
@ -111,17 +100,11 @@
(documentation "Run slurmdbd.") (documentation "Run slurmdbd.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (list #$(file-append (start #~(make-forkexec-constructor (list #$(file-append slurm "/sbin/slurmdbd")
slurm
"/sbin/slurmdbd")
"-D") "-D")
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid #:user (passwd:uid (getpwnam "slurm"))
(getpwnam #:group (passwd:gid (getpwnam "slurm"))))
"slurm"))
#:group (passwd:gid
(getpwnam
"slurm"))))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
(define %slurmdbd-activation (define %slurmdbd-activation
@ -133,44 +116,24 @@
(mkdir-p "/var/spool/slurmctld") (mkdir-p "/var/spool/slurmctld")
(touch "/var/log/slurm/slurmdbd.log") (touch "/var/log/slurm/slurmdbd.log")
(touch "/var/run/slurmdbd.pid") (touch "/var/run/slurmdbd.pid")
(chown "/var/run/slurmdbd.pid" (chown "/var/run/slurmdbd.pid" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:uid (getpwnam "slurm")) (chown "/var/log/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:gid (getpwnam "slurm"))) (chown "/var/log/slurm/slurmdbd.log" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/log/slurm" (chown "/var/lib/slurm-archives" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:uid (getpwnam "slurm")) (chown "/var/lib/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:gid (getpwnam "slurm"))) (chown "/var/spool/slurmctld" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/log/slurm/slurmdbd.log" (chown "/etc/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm-archives"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/spool/slurmctld"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/etc/slurm"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(for-each (lambda (slurm-file) (for-each (lambda (slurm-file)
(chown slurm-file (chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chmod slurm-file #o600)) (chmod slurm-file #o600))
(find-files "/etc/slurm/")) (find-files "/etc/slurm/")) #t))
#t))
(define slurmdbd-service-type (define slurmdbd-service-type
(service-type (name 'slurmdbd) (service-type (name 'slurmdbd)
(extensions (list (service-extension (extensions (list (service-extension
shepherd-root-service-type slurmdbd-service) shepherd-root-service-type slurmdbd-service)
(service-extension activation-service-type (service-extension activation-service-type (const %slurmdbd-activation))
(const (service-extension account-service-type (const %slurm-accounts))))
%slurmdbd-activation))
(service-extension account-service-type
(const %slurm-accounts))))
(description "Run slurmdbd"))) (description "Run slurmdbd")))
; ;
@ -179,12 +142,9 @@
(define-record-type* <slurmctld-configuration> slurmctld-configuration (define-record-type* <slurmctld-configuration> slurmctld-configuration
make-slurmctld-configuration make-slurmctld-configuration
slurmctld-configuration? slurmctld-configuration?
(slurm slurm (slurm slurm (default slurm))
(default slurm)) (slurmctld-conf slurmctld-conf (default (file-append slurm "/etc/slurm/slurmctld.conf")))
(slurmctld-conf slurmctld-conf (log-file log-file (default "/var/log/slurm/slurmctld.log")))
(default (file-append slurm "/etc/slurm/slurmctld.conf")))
(log-file log-file
(default "/var/log/slurm/slurmctld.log")))
(define slurmctld-service (define slurmctld-service
(match-lambda (match-lambda
@ -193,20 +153,14 @@
(documentation "Run slurmctld.") (documentation "Run slurmctld.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (list #$(file-append (start #~(make-forkexec-constructor (list #$(file-append slurm "/sbin/slurmctld")
slurm
"/sbin/slurmctld")
"-D" "-D"
"-R" "-R"
"-f" "-f"
#$slurmctld-conf) #$slurmctld-conf)
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid #:user (passwd:uid (getpwnam "slurm"))
(getpwnam #:group (passwd:gid (getpwnam "slurm"))))
"slurm"))
#:group (passwd:gid
(getpwnam
"slurm"))))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
(define %slurmctld-activation (define %slurmctld-activation
@ -218,45 +172,23 @@
(mkdir-p "/var/spool/slurmctld") (mkdir-p "/var/spool/slurmctld")
(touch "/var/log/slurm/slurmctld.log") (touch "/var/log/slurm/slurmctld.log")
(touch "/var/run/slurmctld.pid") (touch "/var/run/slurmctld.pid")
(chown "/var/log/slurm" (chown "/var/log/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:uid (getpwnam "slurm")) (chown "/var/log/slurm/slurmctld.log" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:gid (getpwnam "slurm"))) (chown "/var/run/slurmctld.pid" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/log/slurm/slurmctld.log" (chown "/var/lib/slurm-archives" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:uid (getpwnam "slurm")) (chown "/var/lib/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:gid (getpwnam "slurm"))) (chown "/var/spool/slurmctld" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/run/slurmctld.pid" (chown "/etc/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm-archives"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/spool/slurmctld"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/etc/slurm"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(for-each (lambda (slurm-file) (for-each (lambda (slurm-file)
(chown slurm-file (chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chmod slurm-file #o600)) (chmod slurm-file #o600))
(find-files "/etc/slurm/")) (find-files "/etc/slurm/")) #t))
#t))
(define slurmctld-service-type (define slurmctld-service-type
(service-type (name 'slurmctld) (service-type (name 'slurmctld)
(extensions (list (service-extension (extensions (list (service-extension shepherd-root-service-type slurmctld-service)
shepherd-root-service-type (service-extension activation-service-type (const %slurmctld-activation))
slurmctld-service) (service-extension account-service-type (const %slurm-accounts))))
(service-extension activation-service-type
(const
%slurmctld-activation))
(service-extension account-service-type
(const %slurm-accounts))))
(description "Run slurmctld"))) (description "Run slurmctld")))
; ;
@ -265,47 +197,26 @@
(define-record-type* <slurmd-configuration> slurmd-configuration (define-record-type* <slurmd-configuration> slurmd-configuration
make-slurmd-configuration make-slurmd-configuration
slurmd-configuration? slurmd-configuration?
(slurm slurm (slurm slurm (default slurm))
(default slurm)) (slurmd-conf slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf")))
(slurmd-conf slurmd-conf (log-file log-file (default "/var/log/slurm/slurmd.log"))
(default (file-append slurm "/etc/slurm/slurm.conf"))) (slurmctld-host slurmctld-host (default #f))
(log-file log-file (log-level log-level (default #f)))
(default "/var/log/slurm/slurmd.log"))
(slurmctld-host slurmctld-host
(default #f))
(log-level log-level
(default #f)))
(define slurmd-service (define slurmd-service
(match-lambda (match-lambda
(($ <slurmd-configuration> (($ <slurmd-configuration> slurm slurmd-conf slurmctld-host log-file log-level)
slurm
slurmd-conf
slurmctld-host
log-file
log-level)
(list (shepherd-service (provision '(slurmd)) (list (shepherd-service (provision '(slurmd))
(documentation "Run slurmd.") (documentation "Run slurmd.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (list #$(file-append (start #~(make-forkexec-constructor (list #$(file-append slurm "/sbin/slurmd")
slurm
"/sbin/slurmd")
"-D" "-D"
#$@(if #$@(if slurmctld-host
slurmctld-host (list (string-append "--conf-server" slurmctld-host))
(list (list (string-append "-f" slurmd-conf)))
(string-append #$@(if log-level
"--conf-server" (list log-level)
slurmctld-host))
(list
(string-append
"-f"
slurmd-conf)))
#$@(if
log-level
(list
log-level)
'())) '()))
#:log-file #$log-file)) #:log-file #$log-file))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
@ -323,10 +234,7 @@
(define slurmd-service-type (define slurmd-service-type
(service-type (name 'slurmd) (service-type (name 'slurmd)
(extensions (list (service-extension (extensions (list (service-extension shepherd-root-service-type slurmd-service)
shepherd-root-service-type slurmd-service) (service-extension activation-service-type (const %slurmd-activation))
(service-extension activation-service-type (service-extension account-service-type (const %slurm-accounts))))
(const %slurmd-activation))
(service-extension account-service-type
(const %slurm-accounts))))
(description "Run slurmd"))) (description "Run slurmd")))