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' of gitlab.univ-nantes.fr:glicid-public/guix-glicid into devel

Browse source
This commit is contained in:
Yann Dupont 2022-12-01 10:19:01 +01:00
commit 3bc68fbfb6
6 changed files with 345 additions and 457 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
glicid/packages/nginx.scm
View file

@ -15,8 +15,7 @@
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (glicid packages openldap) #:use-module (glicid packages openldap))
)
(define-public nginx (define-public nginx
(package (package
@ -31,7 +30,8 @@
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases
%standard-phases
(add-before 'configure 'patch-/bin/sh (add-before 'configure 'patch-/bin/sh
(lambda _ (lambda _
(substitute* "auto/feature" (substitute* "auto/feature"
@ -110,13 +110,9 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/kvspb/nginx-auth-ldap") (url "https://github.com/kvspb/nginx-auth-ldap")
(commit version) (commit version)))
)
)
(file-name (git-file-name "nginx-ldap-auth-module" version)) (file-name (git-file-name "nginx-ldap-auth-module" version))
(sha256 (base32 "023zmdir7w92dnb508ggskkc7kmd7k71hc597sb7i4xfgpwxzq1s")) (sha256 (base32 "023zmdir7w92dnb508ggskkc7kmd7k71hc597sb7i4xfgpwxzq1s"))))
)
)
(synopsis "LDAP Authentication module for nginx") (synopsis "LDAP Authentication module for nginx")
(description "LDAP module for nginx which supports authentication against multiple LDAP servers.") (description "LDAP module for nginx which supports authentication against multiple LDAP servers.")
(build-system gnu-build-system) (build-system gnu-build-system)
@ -127,39 +123,23 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments
`(#:configure-flags '("--add-dynamic-module=.") `(#:configure-flags '("--add-dynamic-module=.")
#:make-flags '("modules") #:make-flags '("modules") ,@(package-arguments nginx))
,@(package-arguments nginx)
)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'unpack-nginx-sources (add-after 'unpack 'unpack-nginx-sources
(lambda* (#:key inputs native-inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)
(begin (begin
;; The nginx source code is part of the module’s source.
(format #t "decompressing nginx source code~%") (format #t "decompressing nginx source code~%")
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources")))
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1"))
) #t )))
#t
)
)
)
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules")))
(install-file "objs/ngx_http_auth_ldap_module.so" modules-dir) (install-file "objs/ngx_http_auth_ldap_module.so" modules-dir)
#t #t )))
)
)
)
(delete 'fix-root-dirs) (delete 'fix-root-dirs)
(delete 'install-man-page) (delete 'install-man-page)))))))
)
)
)
)
)
)
(define-public modsecurity (define-public modsecurity
(package (package
@ -171,9 +151,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(uri (list (uri (list
(string-append "https://github.com/SpiderLabs/ModSecurity/releases/download/v" version "/modsecurity-v" version ".tar.gz") (string-append "https://github.com/SpiderLabs/ModSecurity/releases/download/v" version "/modsecurity-v" version ".tar.gz")
)) ))
(sha256 (base32 "1isng4z2xijqq92105si1zxkzlx4ifdnn38d7n38mrfp7jdwhhg2")) (sha256 (base32 "1isng4z2xijqq92105si1zxkzlx4ifdnn38d7n38mrfp7jdwhhg2"))))
)
)
(synopsis "modsecurity module for nginx") (synopsis "modsecurity module for nginx")
(description "modsecurity module for nginx.") (description "modsecurity module for nginx.")
(license license:asl2.0) (license license:asl2.0)
@ -190,16 +168,12 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
("pkg-config", pkg-config) ("pkg-config", pkg-config)
("nginx-sources", (package-source nginx)) ("nginx-sources", (package-source nginx))
)) ))
(arguments `( (arguments
#:configure-flags (list `( #:configure-flags (list
(string-append "--with-curl=" (assoc-ref %build-inputs "curl")) (string-append "--with-curl=" (assoc-ref %build-inputs "curl"))
(string-append "--with-pcre=" (assoc-ref %build-inputs "pcre:bin") "/bin/pcre-config") (string-append "--with-pcre=" (assoc-ref %build-inputs "pcre:bin") "/bin/pcre-config")
(string-append "--with-libxml=" (assoc-ref %build-inputs "libxml2")) (string-append "--with-libxml=" (assoc-ref %build-inputs "libxml2"))
"--enable-standalone-module" "--enable-standalone-module" )))))
)
))
)
)
(define-public nginx-modsecurity-module (define-public nginx-modsecurity-module
(package (package
@ -238,26 +212,14 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources")))
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1")
) )
#t #t )))
)
)
)
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules")))
(install-file "objs/ngx_http_modsecurity_module.so" modules-dir) (install-file "objs/ngx_http_modsecurity_module.so" modules-dir)
#t #t )))
)
)
)
(delete 'fix-root-dirs) (delete 'fix-root-dirs)
(delete 'install-man-page) (delete 'install-man-page)))))))
)
)
)
)
)
)
(define-public nginx-geoip2-module (define-public nginx-geoip2-module
(package (package
@ -270,9 +232,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(uri (list (uri (list
(string-append "https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/" version ".tar.gz") (string-append "https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/" version ".tar.gz")
)) ))
(sha256 (base32 "0lllgnasd97r6xkj70q42rp61cxrz8qlb64l14rmlwcd6hizqwmd")) (sha256 (base32 "0lllgnasd97r6xkj70q42rp61cxrz8qlb64l14rmlwcd6hizqwmd"))))
)
)
(synopsis "GeoIP2 module for nginx") (synopsis "GeoIP2 module for nginx")
(description "GeoIP2 module for nginx.") (description "GeoIP2 module for nginx.")
(build-system gnu-build-system) (build-system gnu-build-system)
@ -283,9 +243,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments
`(#:configure-flags '("--add-dynamic-module=.") `(#:configure-flags '("--add-dynamic-module=.")
#:make-flags '("modules") #:make-flags '("modules") ,@(package-arguments nginx))
,@(package-arguments nginx)
)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'unpack-nginx-sources (add-after 'unpack 'unpack-nginx-sources
@ -296,27 +254,15 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources")))
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1")
) )
#t #t )))
)
)
)
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules")))
(install-file "objs/ngx_http_geoip2_module.so" modules-dir) (install-file "objs/ngx_http_geoip2_module.so" modules-dir)
(install-file "objs/ngx_stream_geoip2_module.so" modules-dir) (install-file "objs/ngx_stream_geoip2_module.so" modules-dir)
#t #t )))
)
)
)
(delete 'fix-root-dirs) (delete 'fix-root-dirs)
(delete 'install-man-page) (delete 'install-man-page)))))))
)
)
)
)
)
)
(define-public nginx-http_subs_filter-module (define-public nginx-http_subs_filter-module
(package (package
@ -329,9 +275,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(uri (list (uri (list
(string-append "https://github.com/yaoweibin/ngx_http_substitutions_filter_module/archive/" version ".tar.gz") (string-append "https://github.com/yaoweibin/ngx_http_substitutions_filter_module/archive/" version ".tar.gz")
)) ))
(sha256 (base32 "1cxb3yv6085rj50s001p2vblvz5px2v92whwjhb14kl8fnm2cans")) (sha256 (base32 "1cxb3yv6085rj50s001p2vblvz5px2v92whwjhb14kl8fnm2cans"))))
)
)
(synopsis "substitutions_filter module for nginx") (synopsis "substitutions_filter module for nginx")
(description "substitutions_filter module for nginx.") (description "substitutions_filter module for nginx.")
(build-system gnu-build-system) (build-system gnu-build-system)
@ -341,9 +285,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments
`(#:configure-flags '("--add-dynamic-module=.") `(#:configure-flags '("--add-dynamic-module=.")
#:make-flags '("modules") #:make-flags '("modules") ,@(package-arguments nginx))
,@(package-arguments nginx)
)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'unpack-nginx-sources (add-after 'unpack 'unpack-nginx-sources
@ -354,23 +296,11 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.")
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources")))
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1")
) )
#t #t )))
)
)
)
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules")))
(install-file "objs/ngx_http_subs_filter_module.so" modules-dir) (install-file "objs/ngx_http_subs_filter_module.so" modules-dir)
#t #t )))
)
)
)
(delete 'fix-root-dirs) (delete 'fix-root-dirs)
(delete 'install-man-page) (delete 'install-man-page)))))))
)
)
)
)
)
)

26
glicid/packages/sssd.scm
View file

@ -1,26 +0,0 @@
(define-module (glicid packages sssd)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((gnu packages sssd) #:prefix gnu:)
)
(define-public sssd-upstream-orig
(package
(inherit gnu:sssd)
(name "sssd-upstream")
(version "1_16_5")
(source
(origin
(inherit (package-source gnu:sssd))
(method git-fetch)
(uri (git-reference
(url "https://github.com/SSSD/sssd")
(commit (string-append "sssd-" version))
))
(file-name (git-file-name name version))
(sha256 (base32 "0zbs04lkjbp7y92anmafl7gzamcnq1f147p13hc4byyvjk9rg6f7"))
)
)
)
)

20
glicid/services/authentication.scm
View file

@ -17,15 +17,15 @@
(define-record-type* (define-record-type*
<sssd-configuration> <sssd-configuration>
sssd-configuration make-sssd-configuration sssd-configuration? sssd-configuration make-sssd-configuration sssd-configuration?
(sssd-pkg sssd-pkg (default sssd)) (pkg pkg (default sssd))
(sssd-config-file sssd-config-file (default "/etc/sssd/sssd.conf")) (config-file config-file (default "/etc/sssd/sssd.conf"))
(sssd-logger sssd-logger (default "stderr")) (logger logger (default "stderr"))
(sssd-debug-level sssd-debug-level (default "3")) (debug-level debug-level (default "3"))
(log-file log-file (default "/var/log/sssd/sssd.log"))) (log-file log-file (default "/var/log/sssd/sssd.log")))
(define sssd-service (define sssd-service
(match-lambda (match-lambda
(($ <sssd-configuration> sssd-pkg sssd-config-file sssd-logger sssd-debug-level log-file) (($ <sssd-configuration> pkg config-file logger debug-level log-file)
(list (list
(shepherd-service (shepherd-service
(provision '(sssd)) (provision '(sssd))
@ -34,11 +34,11 @@
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append sssd-pkg "/sbin/sssd") #$(file-append pkg "/sbin/sssd")
"-i" "-i"
"-c" #$sssd-config-file "-c" #$config-file
"--logger" #$sssd-logger "--logger" #$logger
"-d" #$sssd-debug-level "-d" #$debug-level
) )
#:log-file #$log-file #:log-file #$log-file
)) ))
@ -51,7 +51,7 @@
(mkdir-p "/var/lib/sss/db") (mkdir-p "/var/lib/sss/db")
(mkdir-p "/var/lib/sss/mc") (mkdir-p "/var/lib/sss/mc")
(mkdir-p "/var/lib/sss/pipes/private") (mkdir-p "/var/lib/sss/pipes/private")
(install-file #$(file-append sssd-pkg "/lib/sssd/conf/sssd.conf") "/etc/sssd/") (install-file #$(file-append pkg "/lib/sssd/conf/sssd.conf") "/etc/sssd/")
#t )) #t ))
(define sssd-service-type (define sssd-service-type

19
glicid/services/networking.scm
View file

@ -18,17 +18,16 @@
<squid-configuration> <squid-configuration>
squid-configuration make-squid-configuration squid-configuration make-squid-configuration
squid-configuration? squid-configuration?
(squid-pkg squid-pkg (default squid)) (pkg pkg (default squid))
(squid-port squid-port (default 3128)) (port port (default 3128))
(squid-loglevel squid-loglevel (default 1)) (loglevel loglevel (default 1))
(squid-config-file squid-config-file (default (file-append squid "/etc/squid.conf"))) (config-file config-file (default (file-append squid "/etc/squid.conf")))
(pid-file squid-pid-file (default "/var/run/squid/squid.pid")) (pid-file pid-file (default "/var/run/squid/squid.pid"))
(log-file squid-log-file (default "/var/log/squid/squid.log")) (log-file log-file (default "/var/log/squid/squid.log")))
)
(define squid-shepherd-service (define squid-shepherd-service
(match-lambda (match-lambda
(($ <squid-configuration> squid-pkg squid-port squid-loglevel squid-config-file pid-file log-file) (($ <squid-configuration> pkg port loglevel config-file pid-file log-file)
(list (list
(shepherd-service (shepherd-service
(provision '(squid)) (provision '(squid))
@ -37,8 +36,8 @@
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append squid-pkg "/sbin/squid") #$(file-append pkg "/sbin/squid")
"-f" #$squid-config-file "-f" #$config-file
) )
#:pid-file #$pid-file #:pid-file #$pid-file
#:log-file #$log-file #:log-file #$log-file

14
glicid/services/openldap.scm
View file

@ -17,15 +17,15 @@
openldap-configuration make-openldap-configuration openldap-configuration make-openldap-configuration
openldap-configuration? openldap-configuration?
(openldap-pkg openldap-pkg (default openldap)) (openldap-pkg openldap-pkg (default openldap))
(uri openldap-uri (default "ldapi:// ldap://")) (uri uri (default "ldapi:// ldap://"))
(logflags openldap-logflags (default "0")) (logflags logflags (default "0"))
(pid-file openldap-pid-file (default "/var/run/openldap/slapd.pid")) (pid-file pid-file (default "/var/run/openldap/slapd.pid"))
(config-file openldap--config-file (default (file-append openldap "/etc/openldap/slapd.conf"))) (config-file config-file (default (file-append openldap "/etc/openldap/slapd.conf")))
(log-file openldap-log-file (default "/var/log/slapd.log"))) (log-file log-file (default "/var/log/slapd.log")))
(define openldap-shepherd-service (define openldap-shepherd-service
(match-lambda (match-lambda
(($ <openldap-configuration> openldap-pkg uri logflags pid-file config-file log-file) (($ <openldap-configuration> pkg uri logflags pid-file config-file log-file)
(list (list
(shepherd-service (shepherd-service
(provision '(slapd)) (provision '(slapd))
@ -34,7 +34,7 @@
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append openldap "/libexec/slapd") #$(file-append pkg "/libexec/slapd")
"-h" #$uri "-h" #$uri
"-d" #$logflags "-d" #$logflags
"-f" #$config-file "-f" #$config-file

61
glicid/services/parallel.scm
View file

@ -29,8 +29,7 @@
slurmd-service-type slurmd-service-type
%slurm-group %slurm-group
%slurm-account %slurm-account
%slurm-accounts %slurm-accounts ))
))
; ;
; Munged ; Munged
; ;
@ -58,16 +57,14 @@
"-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
#~(begin #~(begin
(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 (service-type
@ -90,8 +87,7 @@
(home-directory "/var/spool/slurm") (home-directory "/var/spool/slurm")
(shell (file-append bash "/bin/bash")))) (shell (file-append bash "/bin/bash"))))
(define %slurm-accounts (define %slurm-accounts (list %slurm-group %slurm-account))
(list %slurm-group %slurm-account))
; ;
; slurmdbd ; slurmdbd
@ -100,9 +96,9 @@
<slurmdbd-configuration> <slurmdbd-configuration>
slurmdbd-configuration make-slurmdbd-configuration slurmdbd-configuration make-slurmdbd-configuration
slurmdbd-configuration? slurmdbd-configuration?
(slurm slurm-configuration-slurm (default slurm)) (slurm slurm (default slurm))
(slurmdbd-conf slurmdbd-slurmdbd-conf (default (file-append slurm "/etc/slurm/slurmdbd.conf"))) (slurmdbd-conf slurmdbd-conf (default (file-append slurm "/etc/slurm/slurmdbd.conf")))
(log-file slurmdbd-log-file (default "/var/log/slurm/slurmdbd.log"))) (log-file log-file (default "/var/log/slurm/slurmdbd.log")))
(define slurmdbd-service (define slurmdbd-service
(match-lambda (match-lambda
@ -116,12 +112,10 @@
(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
@ -144,8 +138,7 @@
(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 slurmdbd-service-type (define slurmdbd-service-type
(service-type (service-type
@ -163,9 +156,9 @@
<slurmctld-configuration> <slurmctld-configuration>
slurmctld-configuration make-slurmctld-configuration slurmctld-configuration make-slurmctld-configuration
slurmctld-configuration? slurmctld-configuration?
(slurm slurm-configuration-slurm (default slurm)) (slurm slurm (default slurm))
(slurmctld-conf slurmctld-slurmctld-conf (default (file-append slurm "/etc/slurm/slurmctld.conf"))) (slurmctld-conf slurmctld-conf (default (file-append slurm "/etc/slurm/slurmctld.conf")))
(log-file slurmctld-log-file (default "/var/log/slurm/slurmctld.log"))) (log-file log-file (default "/var/log/slurm/slurmctld.log")))
(define slurmctld-service (define slurmctld-service
(match-lambda (match-lambda
@ -180,12 +173,10 @@
(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
@ -226,12 +217,11 @@
<slurmd-configuration> <slurmd-configuration>
slurmd-configuration make-slurmd-configuration slurmd-configuration make-slurmd-configuration
slurmd-configuration? slurmd-configuration?
(slurm slurm-configuration-slurm (default slurm)) (slurm slurm (default slurm))
(slurmd-conf slurmd-slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf"))) (slurmd-conf slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf")))
(log-file slurmd-log-file (default "/var/log/slurm/slurmd.log")) (log-file log-file (default "/var/log/slurm/slurmd.log"))
(slurmctld-host slurmd-slurmctld-host (default #f)); string slurmctld-host[:port] (slurmctld-host slurmctld-host (default #f))
(log-level slurmd-log-level (default #f)); string Verbose mode. Multiple -v's increase verbosity (log-level log-level (default #f)))
)
(define slurmd-service (define slurmd-service
(match-lambda (match-lambda
@ -248,16 +238,11 @@
"-D" "-D"
#$@(if slurmctld-host #$@(if slurmctld-host
(list (string-append "--conf-server" slurmctld-host)) (list (string-append "--conf-server" slurmctld-host))
(list (string-append "-f" slurmd-conf)) (list (string-append "-f" slurmd-conf)))
)
#$@(if log-level #$@(if log-level
(list 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