Merge branch 'devel' of gitlab.univ-nantes.fr:glicid-public/guix-glicid into devel

This commit is contained in:
Jean-François GUILLAUME 2023-01-11 11:48:44 +01:00
commit fae637ae7a
GPG key ID: 38751DAE145EFB5A
2 changed files with 4 additions and 4 deletions

View file

@ -33,7 +33,7 @@
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append rsyslog-pkg "/sbin/rsyslogd") #$(file-append rsyslog-pkg "/sbin/rsyslogd")
"-dn" "-n"
"-f" #$config-file "-f" #$config-file
"-i" #$pid-file "-i" #$pid-file
) )

View file

@ -199,13 +199,13 @@
slurmd-configuration? slurmd-configuration?
(slurm slurm (default slurm)) (slurm slurm (default slurm))
(slurmd-conf slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf"))) (slurmd-conf slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf")))
(log-file log-file (default "/var/log/slurm/slurmd.log"))
(slurmctld-host slurmctld-host (default #f)) (slurmctld-host slurmctld-host (default #f))
(log-level log-level (default #f))) (log-level log-level (default #f))
(log-file log-file (default "/var/log/slurm/slurmd.log")))
(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-level log-file)
(list (shepherd-service (provision '(slurmd)) (list (shepherd-service (provision '(slurmd))
(documentation "Run slurmd.") (documentation "Run slurmd.")
(requirement '(user-processes)) (requirement '(user-processes))