Merge branch 'devel' into 'main'

Devel

See merge request glicid-public/guix-glicid!152
This commit is contained in:
Jean-François GUILLAUME 2022-11-24 14:41:59 +00:00
commit 7d1b0a7d6f
2 changed files with 14 additions and 25 deletions

View file

@ -46,9 +46,12 @@
(define %sssd-activation (define %sssd-activation
#~(begin #~(begin
(mkdir-p "/etc/sssd") (mkdir-p "/etc/sssd/conf.d")
(mkdir-p "/var/log/sssd") (mkdir-p "/var/log/sssd")
(mkdir-p "/var/lib/sss/db") (mkdir-p "/var/lib/sss/db")
(mkdir-p "/var/lib/sss/mc")
(mkdir-p "/var/lib/sss/pipes/private")
(install-file #$(file-append sssd-pkg "/lib/sssd/conf/sssd.conf") "/etc/sssd/")
#t )) #t ))
(define sssd-service-type (define sssd-service-type

View file

@ -81,17 +81,6 @@
; Shared slurm account ; Shared slurm account
; ;
#!(define %slurm-accounts
(list
(user-group (name "slurm") (system? #t))
(user-account
(name "slurm")
(group "slurm")
(system? #t)
(comment "slurm server user")
(home-directory "/var/spool/slurm")
(shell (file-append bash "/bin/bash")))))
!#
(define %slurm-group (user-group (name "slurm") (system? #t))) (define %slurm-group (user-group (name "slurm") (system? #t)))
(define %slurm-account (user-account (define %slurm-account (user-account
(name "slurm") (name "slurm")
@ -102,10 +91,7 @@
(shell (file-append bash "/bin/bash")))) (shell (file-append bash "/bin/bash"))))
(define %slurm-accounts (define %slurm-accounts
(list (list %slurm-group %slurm-account))
%slurm-group %slurm-account))
; ;
; slurmdbd ; slurmdbd