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

See merge request glicid-public/guix-glicid!147
This commit is contained in:
Jean-François GUILLAUME 2022-11-24 12:04:17 +00:00
commit ace1b0b637
2 changed files with 72 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
glicid/services/authentication.scm
View file

@ -6,32 +6,22 @@
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (gnu packages sssd) #:use-module (gnu packages sssd)
#:use-module (glicid system file-systems) #:use-module (glicid system file-systems)
#:use-module (glicid utils)
#:export ( #:export (
sssd-configuration sssd-configuration
sssd-configuration? sssd-configuration?
sssd-service sssd-service
sssd-service-type sssd-service-type
) ))
)
(define-record-type* <sssd-configuration> (define-record-type*
<sssd-configuration>
sssd-configuration make-sssd-configuration sssd-configuration? sssd-configuration make-sssd-configuration sssd-configuration?
(sssd-pkg sssd-pkg (sssd-pkg sssd-pkg (default sssd))
(default sssd) (sssd-conf sssd-conf (default "/etc/sssd/sssd.conf"))
) (sssd-logger sssd-logger (default "stderr"))
(sssd-conf sssd-conf (sssd-debug-level sssd-debug-level (default "3"))
(default (file-append sssd-pkg "/lib/sssd/conf/sssd.conf")) (log-file log-file (default "/var/log/sssd/sssd.log")))
)
(sssd-logger sssd-logger
(default "stderr")
)
(sssd-debug-level sssd-debug-level
(default #f)
)
(log-file log-file
(default "/var/log/sssd/sssd.log")
)
)
(define sssd-service (define sssd-service
(match-lambda (match-lambda
@ -40,52 +30,33 @@
(shepherd-service (shepherd-service
(provision '(sssd)) (provision '(sssd))
(documentation "Run sssd.") (documentation "Run sssd.")
(requirement '( (requirement '( user-processes ))
user-processes
))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append sssd-pkg "/sbin/sssd") #$(file-append sssd-pkg "/sbin/sssd")
; "--interactive" "-i"
(string-append "--config=" sssd-conf) "-c" sssd-conf
(string-append "--logger=" sssd-logger) "--logger" sssd-logger
#$@(if sssd-debug-level "-d" sssd-debug-level
list (string-append "--debug-level=" 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)) (with-imported-modules '((guix build utils))
#~(begin #~(begin
(use-modules (guix build utils)) (touch "/var/log/toto.log")
(define (touch file-name) (mkdir-p "/etc/sssd")
(call-with-output-file file-name (const #t))
)
(mkdir-p "/var/log/sssd") (mkdir-p "/var/log/sssd")
(mkdir-p "/var/lib/sssd") (mkdir-p "/var/lib/sss/db")
#t #t )))
)
)
)
(define sssd-service-type (define sssd-service-type
(service-type (name 'sssd) (service-type
(extensions (name 'sssd)
(list (extensions (list
(service-extension shepherd-root-service-type sssd-service) (service-extension shepherd-root-service-type sssd-service)
(service-extension activation-service-type (const %sssd-activation)) (service-extension activation-service-type (const %sssd-activation))))
) (description "Run sssd")))
)
(description "Run sssd")
)
)

22
glicid/utils.scm
View file

@ -11,33 +11,23 @@
#:export (transform-package) #:export (transform-package)
#:export (instead-of) #:export (instead-of)
) )
;(define (latest-version v1 v2) (if (string> (package-version v1) (package-version v2)) v1 v2))
(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)
((=) v1) ((=) v1)
((<) v2) ((<) v2)))
)
)
(define gcc11-instead-of-gcc (define gcc11-instead-of-gcc
(package-input-rewriting `( (package-input-rewriting
(,gcc-toolchain . ,gcc-toolchain-11) `((,gcc-toolchain . ,gcc-toolchain-11)
(,gfortran-toolchain . ,gfortran-toolchain-11) (,gfortran-toolchain . ,gfortran-toolchain-11)
)) )))
)
(define (transform-package original-package suffix) (define (transform-package original-package suffix)
(package (package
(inherit original-package) (inherit original-package)
(name (string-append (package-name original-package) "-" suffix )) (name (string-append (package-name original-package) "-" suffix ))))
)
)
(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)))))
))
)