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

Merge branch 'devel' into 'main'

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

See merge request glicid-public/guix-glicid!148
This commit is contained in:
Jean-François GUILLAUME 2022-11-24 12:31:13 +00:00
commit b769b0b989
3 changed files with 214 additions and 294 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
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
(touch "/var/log/toto.log")
(mkdir-p "/etc/sssd") (mkdir-p "/etc/sssd")
(mkdir-p "/var/log/sssd") (mkdir-p "/var/log/sssd")
(mkdir-p "/var/lib/sss/db") (mkdir-p "/var/lib/sss/db")
#t ))) #t ))
(define sssd-service-type (define sssd-service-type
(service-type (service-type

177
glicid/services/parallel.scm
View file

@ -4,10 +4,12 @@
#: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 build utils)
#:use-module (guix records) #:use-module (guix records)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (gnu packages parallel) #:use-module (gnu packages parallel)
#:use-module (glicid system file-systems) #:use-module (glicid system file-systems)
#:use-module (glicid utils)
#:export ( #:export (
munged-configuration munged-configuration
munged-configuration? munged-configuration?
@ -26,25 +28,17 @@
slurmd-service slurmd-service
slurmd-service-type slurmd-service-type
%slurm-accounts %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
@ -64,35 +58,25 @@
) )
#: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
(use-modules (guix build utils))
(mkdir-p "/var/run/munge") (mkdir-p "/var/run/munge")
(mkdir-p "/var/lib/munge") (mkdir-p "/var/lib/munge")
#t #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,27 +91,18 @@
(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
@ -147,20 +122,10 @@
#: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
(use-modules (guix build utils))
(define (touch file-name)
(call-with-output-file file-name (const #t))
)
(mkdir-p "/etc/slurm") (mkdir-p "/etc/slurm")
(mkdir-p "/var/log/slurm") (mkdir-p "/var/log/slurm")
(mkdir-p "/var/lib/slurm-archives") (mkdir-p "/var/lib/slurm-archives")
@ -180,12 +145,11 @@
(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 (extensions
(list (list
(service-extension shepherd-root-service-type slurmdbd-service) (service-extension shepherd-root-service-type slurmdbd-service)
@ -193,26 +157,18 @@
(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
@ -233,20 +189,10 @@
#: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
(use-modules (guix build utils))
(define (touch file-name)
(call-with-output-file file-name (const #t))
)
(mkdir-p "/etc/slurm") (mkdir-p "/etc/slurm")
(mkdir-p "/var/log/slurm") (mkdir-p "/var/log/slurm")
(mkdir-p "/var/lib/slurm-archives") (mkdir-p "/var/lib/slurm-archives")
@ -265,13 +211,11 @@
(chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown slurm-file (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 (extensions
(list (list
(service-extension shepherd-root-service-type slurmctld-service) (service-extension shepherd-root-service-type slurmctld-service)
@ -279,31 +223,20 @@
(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"))
(slurmd-conf slurmd-slurmd-conf (slurmctld-host slurmd-slurmctld-host (default #f)); string slurmctld-host[:port]
(default (file-append slurm "/etc/slurm/slurm.conf")) (log-level slurmd-log-level (default #f)); string Verbose mode. Multiple -v's increase verbosity
)
(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
@ -313,9 +246,7 @@
(shepherd-service (shepherd-service
(provision '(slurmd)) (provision '(slurmd))
(documentation "Run slurmd.") (documentation "Run slurmd.")
(requirement '( (requirement '( user-processes ))
user-processes
))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
@ -333,20 +264,10 @@
) )
#: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
(use-modules (guix build utils))
(define (touch file-name)
(call-with-output-file file-name (const #t))
)
(mkdir-p "/etc/slurm") (mkdir-p "/etc/slurm")
(mkdir-p "/var/log/slurm") (mkdir-p "/var/log/slurm")
(mkdir-p "/var/lib/slurm-archives") (mkdir-p "/var/lib/slurm-archives")
@ -354,13 +275,11 @@
(mkdir-p "/var/spool/slurmd") (mkdir-p "/var/spool/slurmd")
(touch "/var/log/slurm/slurmd.log") (touch "/var/log/slurm/slurmd.log")
(touch "/var/run/slurmd.pid") (touch "/var/run/slurmd.pid")
#t #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)
@ -368,6 +287,4 @@
(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))