GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-29 21:58:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

sssd's service + define a touch directive + removing everydefinition of touch in slurm*

Browse source
This commit is contained in:
Jean-François GUILLAUME 2022-11-24 13:30:05 +01:00
parent dd7cfd50e4
commit ae1c899d39
Signed by: Jean-François GUILLAUME
GPG key ID: 38751DAE145EFB5A
3 changed files with 214 additions and 294 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
glicid/services/authentication.scm
View file

@ -36,22 +36,20 @@
(list (list
#$(file-append sssd-pkg "/sbin/sssd") #$(file-append sssd-pkg "/sbin/sssd")
"-i" "-i"
"-c" sssd-conf "-c" #$sssd-conf
"--logger" sssd-logger "--logger" #$sssd-logger
"-d" sssd-debug-level "-d" #$sssd-debug-level
) )
#:log-file #$log-file #:log-file #$log-file
)) ))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
(define %sssd-activation (define %sssd-activation
(with-imported-modules '((guix build utils)) #~(begin
#~(begin (mkdir-p "/etc/sssd")
(touch "/var/log/toto.log") (mkdir-p "/var/log/sssd")
(mkdir-p "/etc/sssd") (mkdir-p "/var/lib/sss/db")
(mkdir-p "/var/log/sssd") #t ))
(mkdir-p "/var/lib/sss/db")
#t )))
(define sssd-service-type (define sssd-service-type
(service-type (service-type

475
glicid/services/parallel.scm
View file

@ -1,98 +1,82 @@
(define-module (glicid services parallel) (define-module (glicid services parallel)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#: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 build utils)
#:use-module (ice-9 match) #:use-module (guix records)
#:use-module (gnu packages parallel) #:use-module (ice-9 match)
#:use-module (glicid system file-systems) #:use-module (gnu packages parallel)
#:export ( #:use-module (glicid system file-systems)
munged-configuration #:use-module (glicid utils)
munged-configuration? #:export (
munged-service munged-configuration
munged-service-type munged-configuration?
slurmdbd-configuration munged-service
slurmdbd-configuration? munged-service-type
slurmdbd-service slurmdbd-configuration
slurmdbd-service-type slurmdbd-configuration?
slurmctld-configuration slurmdbd-service
slurmctld-configuration? slurmdbd-service-type
slurmctld-service slurmctld-configuration
slurmctld-service-type slurmctld-configuration?
slurmd-configuration slurmctld-service
slurmd-configuration? slurmctld-service-type
slurmd-service slurmd-configuration
slurmd-service-type slurmd-configuration?
%slurm-accounts slurmd-service
) slurmd-service-type
) %slurm-accounts
))
; ;
; Munged ; Munged
; ;
(define-record-type* <munged-configuration> (define-record-type*
<munged-configuration>
munged-configuration make-munged-configuration 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")))
) (log-file munged-log-file (default "/var/log/munged.log")))
(key-file munged-key-file
(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
(($ <munged-configuration> munge key-file log-file) (($ <munged-configuration> munge key-file log-file)
(list (list
(shepherd-service (shepherd-service
(provision '(munged) ) (provision '(munged))
(documentation "Run munged.") (documentation "Run munged.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append munge "/sbin/munged") #$(file-append munge "/sbin/munged")
"-F" "-F"
"-f" ; until we fix the permissions "-f" ; until we fix the permissions
"--key-file" #$key-file "--key-file" #$key-file
) )
#:log-file #$log-file #:log-file #$log-file
)) ))
(stop #~(make-kill-destructor)) (stop #~(make-kill-destructor)))))))
)
)
)
)
)
(define %munged-activation (define %munged-activation
(with-imported-modules '((guix build utils)) #~(begin
#~(begin (mkdir-p "/var/run/munge")
(use-modules (guix build utils)) (mkdir-p "/var/lib/munge")
(mkdir-p "/var/run/munge") #t
(mkdir-p "/var/lib/munge") ))
#t
)
)
)
(define munged-service-type (define munged-service-type
(service-type (name 'munged) (service-type
(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")
)
)
; ;
; Shared slurm account ; Shared slurm account
@ -107,267 +91,200 @@
(system? #t) (system? #t)
(comment "slurm server user") (comment "slurm server user")
(home-directory "/var/spool/slurm") (home-directory "/var/spool/slurm")
(shell (file-append bash "/bin/bash")) (shell (file-append bash "/bin/bash")))))
)
)
)
; ;
; slurmdbd ; slurmdbd
; ;
(define-record-type* <slurmdbd-configuration> (define-record-type*
<slurmdbd-configuration>
slurmdbd-configuration make-slurmdbd-configuration slurmdbd-configuration make-slurmdbd-configuration
slurmdbd-configuration? slurmdbd-configuration?
(slurm slurm-configuration-slurm (slurm slurm-configuration-slurm (default slurm))
(default slurm) (slurmdbd-conf slurmdbd-slurmdbd-conf (default (file-append slurm "/etc/slurm/slurmdbd.conf")))
) (log-file slurmdbd-log-file (default "/var/log/slurm/slurmdbd.log")))
(slurmdbd-conf slurmdbd-slurmdbd-conf
(default (file-append slurm "/etc/slurm/slurmdbd.conf"))
)
(log-file slurmdbd-log-file
(default "/var/log/slurm/slurmdbd.log")
)
)
(define slurmdbd-service (define slurmdbd-service
(match-lambda (match-lambda
(($ <slurmdbd-configuration> slurm slurmdbd-conf log-file) (($ <slurmdbd-configuration> slurm slurmdbd-conf log-file)
(list (list
(shepherd-service (shepherd-service
(provision '(slurmdbd) ) (provision '(slurmdbd))
(documentation "Run slurmdbd.") (documentation "Run slurmdbd.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append slurm "/sbin/slurmdbd") #$(file-append slurm "/sbin/slurmdbd")
"-D" "-D"
) )
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid (getpwnam "slurm")) #:user (passwd:uid (getpwnam "slurm"))
#:group (passwd:gid (getpwnam "slurm")) #:group (passwd:gid (getpwnam "slurm"))
)) ))
(stop #~(make-kill-destructor)) (stop #~(make-kill-destructor)))))))
)
)
)
)
)
(define %slurmdbd-activation (define %slurmdbd-activation
(with-imported-modules '((guix build utils)) #~(begin
#~(begin (mkdir-p "/etc/slurm")
(use-modules (guix build utils)) (mkdir-p "/var/log/slurm")
(define (touch file-name) (mkdir-p "/var/lib/slurm-archives")
(call-with-output-file file-name (const #t)) (mkdir-p "/var/lib/slurm")
) (mkdir-p "/var/spool/slurmctld")
(mkdir-p "/etc/slurm") (touch "/var/log/slurm/slurmdbd.log")
(mkdir-p "/var/log/slurm") (touch "/var/run/slurmdbd.pid")
(mkdir-p "/var/lib/slurm-archives") (chown "/var/run/slurmdbd.pid" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(mkdir-p "/var/lib/slurm") (chown "/var/log/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(mkdir-p "/var/spool/slurmctld") (chown "/var/log/slurm/slurmdbd.log" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(touch "/var/log/slurm/slurmdbd.log") (chown "/var/lib/slurm-archives" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(touch "/var/run/slurmdbd.pid") (chown "/var/lib/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/run/slurmdbd.pid" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown "/var/spool/slurmctld" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/log/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown "/etc/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/log/slurm/slurmdbd.log" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (for-each (lambda (slurm-file)
(chown "/var/lib/slurm-archives" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chmod slurm-file #o600)
(chown "/var/spool/slurmctld" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) )(find-files "/etc/slurm/"))
(chown "/etc/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) #t
(for-each (lambda (slurm-file) ))
(chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chmod slurm-file #o600)
)(find-files "/etc/slurm/"))
#t
)
)
)
(define slurmdbd-service-type (define slurmdbd-service-type
(service-type (name 'slurmdbd) (service-type
(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")
)
)
; ;
; slurmctld ; slurmctld
; ;
(define-record-type* <slurmctld-configuration> (define-record-type*
<slurmctld-configuration>
slurmctld-configuration make-slurmctld-configuration slurmctld-configuration make-slurmctld-configuration
slurmctld-configuration? slurmctld-configuration?
(slurm slurm-configuration-slurm (slurm slurm-configuration-slurm (default slurm))
(default slurm) (slurmctld-conf slurmctld-slurmctld-conf (default (file-append slurm "/etc/slurm/slurmctld.conf")))
) (log-file slurmctld-log-file (default "/var/log/slurm/slurmctld.log")))
(slurmctld-conf slurmctld-slurmctld-conf
(default (file-append slurm "/etc/slurm/slurmctld.conf"))
)
(log-file slurmctld-log-file
(default "/var/log/slurm/slurmctld.log")
)
)
(define slurmctld-service (define slurmctld-service
(match-lambda (match-lambda
(($ <slurmctld-configuration> slurm slurmctld-conf log-file) (($ <slurmctld-configuration> slurm slurmctld-conf log-file)
(list (list
(shepherd-service (shepherd-service
(provision '(slurmctld) ) (provision '(slurmctld))
(documentation "Run slurmctld.") (documentation "Run slurmctld.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append slurm "/sbin/slurmctld") #$(file-append slurm "/sbin/slurmctld")
"-D" "-R" "-D" "-R"
"-f" #$slurmctld-conf "-f" #$slurmctld-conf
) )
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid (getpwnam "slurm")) #:user (passwd:uid (getpwnam "slurm"))
#:group (passwd:gid (getpwnam "slurm")) #:group (passwd:gid (getpwnam "slurm"))
)) ))
(stop #~(make-kill-destructor)) (stop #~(make-kill-destructor)))))))
)
)
)
)
)
(define %slurmctld-activation (define %slurmctld-activation
(with-imported-modules '((guix build utils)) #~(begin
#~(begin (mkdir-p "/etc/slurm")
(use-modules (guix build utils)) (mkdir-p "/var/log/slurm")
(define (touch file-name) (mkdir-p "/var/lib/slurm-archives")
(call-with-output-file file-name (const #t)) (mkdir-p "/var/lib/slurm")
) (mkdir-p "/var/spool/slurmctld")
(mkdir-p "/etc/slurm") (touch "/var/log/slurm/slurmctld.log")
(mkdir-p "/var/log/slurm") (touch "/var/run/slurmctld.pid")
(mkdir-p "/var/lib/slurm-archives") (chown "/var/log/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(mkdir-p "/var/lib/slurm") (chown "/var/log/slurm/slurmctld.log" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(mkdir-p "/var/spool/slurmctld") (chown "/var/run/slurmctld.pid" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(touch "/var/log/slurm/slurmctld.log") (chown "/var/lib/slurm-archives" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(touch "/var/run/slurmctld.pid") (chown "/var/lib/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/log/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown "/var/spool/slurmctld" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/log/slurm/slurmctld.log" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown "/etc/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/run/slurmctld.pid" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (for-each (lambda (slurm-file)
(chown "/var/lib/slurm-archives" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chmod slurm-file #o600)
(chown "/var/spool/slurmctld" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) )(find-files "/etc/slurm/"))
(chown "/etc/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) #t ))
(for-each (lambda (slurm-file)
(chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chmod slurm-file #o600)
)(find-files "/etc/slurm/"))
#t
)
)
)
(define slurmctld-service-type (define slurmctld-service-type
(service-type (name 'slurmctld) (service-type
(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")
)
)
; ;
; slurmd ; slurmd
; ;
(define-record-type* <slurmd-configuration> (define-record-type*
<slurmd-configuration>
slurmd-configuration make-slurmd-configuration slurmd-configuration make-slurmd-configuration
slurmd-configuration? slurmd-configuration?
(slurm slurm-configuration-slurm (slurm slurm-configuration-slurm (default slurm))
(default slurm) (slurmd-conf slurmd-slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf")))
(log-file slurmd-log-file (default "/var/log/slurm/slurmd.log"))
(slurmctld-host slurmd-slurmctld-host (default #f)); string slurmctld-host[:port]
(log-level slurmd-log-level (default #f)); string Verbose mode. Multiple -v's increase verbosity
) )
(slurmd-conf slurmd-slurmd-conf
(default (file-append slurm "/etc/slurm/slurm.conf"))
)
(log-file slurmd-log-file
(default "/var/log/slurm/slurmd.log")
)
(slurmctld-host slurmd-slurmctld-host
(default #f) ; string slurmctld-host[:port]
)
(log-level slurmd-log-level
(default #f) ; string Verbose mode. Multiple -v's increase verbosity
)
)
(define slurmd-service (define slurmd-service
(match-lambda (match-lambda
(($ <slurmd-configuration> slurm slurmd-conf slurmctld-host log-file log-level) (($ <slurmd-configuration> slurm slurmd-conf slurmctld-host log-file log-level)
(list (list
(shepherd-service (shepherd-service
(provision '(slurmd) ) (provision '(slurmd))
(documentation "Run slurmd.") (documentation "Run slurmd.")
(requirement '( (requirement '( user-processes ))
user-processes (respawn? #t)
)) (start #~(make-forkexec-constructor
(respawn? #t) (list
(start #~(make-forkexec-constructor #$(file-append slurm "/sbin/slurmd")
(list "-D"
#$(file-append slurm "/sbin/slurmd") #$@(if slurmctld-host
"-D" (list (string-append "--conf-server" slurmctld-host))
#$@(if slurmctld-host (list (string-append "-f" slurmd-conf))
(list (string-append "--conf-server" slurmctld-host)) )
(list (string-append "-f" slurmd-conf)) #$@(if log-level
) (list log-level)
#$@(if log-level '()
(list log-level) )
'()
) )
#:log-file #$log-file
) ))
#:log-file #$log-file (stop #~(make-kill-destructor)))))))
))
(stop #~(make-kill-destructor))
)
)
)
)
)
(define %slurmd-activation (define %slurmd-activation
(with-imported-modules '((guix build utils)) #~(begin
#~(begin (mkdir-p "/etc/slurm")
(use-modules (guix build utils)) (mkdir-p "/var/log/slurm")
(define (touch file-name) (mkdir-p "/var/lib/slurm-archives")
(call-with-output-file file-name (const #t)) (mkdir-p "/var/lib/slurm")
) (mkdir-p "/var/spool/slurmd")
(mkdir-p "/etc/slurm") (touch "/var/log/slurm/slurmd.log")
(mkdir-p "/var/log/slurm") (touch "/var/run/slurmd.pid")
(mkdir-p "/var/lib/slurm-archives") #t ))
(mkdir-p "/var/lib/slurm")
(mkdir-p "/var/spool/slurmd")
(touch "/var/log/slurm/slurmd.log")
(touch "/var/run/slurmd.pid")
#t
)
)
)
(define slurmd-service-type (define slurmd-service-type
(service-type (name 'slurmd) (service-type
(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")
)
)

15
glicid/utils.scm
View file

@ -6,11 +6,13 @@
#:use-module (glicid packages gcc) #:use-module (glicid packages gcc)
#:use-module (gnu packages commencement) #:use-module (gnu packages commencement)
#:use-module (gnu packages) #:use-module (gnu packages)
#:export (latest-version) #:export (
#:export (gcc11-instead-of-gcc) latest-version
#:export (transform-package) gcc11-instead-of-gcc
#:export (instead-of) transform-package
) instead-of
touch
))
(define (latest-version v1 v2) (define (latest-version v1 v2)
(case (version-compare (package-version v1) (package-version v2)) (case (version-compare (package-version v1) (package-version v2))
((>) v1) ((>) v1)
@ -31,3 +33,6 @@
(define (instead-of package-a-spec package-b) (define (instead-of package-a-spec package-b)
(package-input-rewriting/spec `( (package-input-rewriting/spec `(
(,package-a-spec . ,(const package-b))))) (,package-a-spec . ,(const package-b)))))
(define (touch filename)
(call-with-output-file file-name (const #t))