backporting master into devel (devel was behind master)

This commit is contained in:
Jean-François GUILLAUME 2022-05-10 10:00:46 +02:00
parent cc5cc2847f
commit 54560ad0ea
GPG key ID: 38751DAE145EFB5A
34 changed files with 10115 additions and 1803 deletions

View file

@ -1,5 +1,5 @@
(define-module (glicid services openldap)
#:use-module (glicid packages openldap)
#:use-module (gnu packages openldap)
#:use-module (gnu services)
#:use-module (gnu services shepherd)
#:use-module (guix)
@ -8,73 +8,80 @@
#: export (
openldap-configuration
openldap-configuration?
%default-slapd.conf
openldap-shepherd-service
openldap-service-type
)
)
(define-record-type* <openldap-configuration>
openldap-configuration make-openldap-configuration
openldap-configuration?
(openldap openldap-configuration-openldap ;<package>
(default openldap-glicid)
)
(arguments openldap-configuration-arguments ;list of strings
(default '())
)
(logflags openldap-configuration-logflags ;number
(default "0")
)
(log-file openldap-configuration-log-file ; string
(default "/var/log/slapd.log")
)
(pid-file openldap-configuration-pid-file ; string
(default "/var/run/openldap/slapd.pid")
)
(config-file openldap-configuration-config-file ; string
(default %default-slapd.conf)
)
(schema-dir openldap-configuration-schema-dir ; string
(default '())
)
openldap-configuration make-openldap-configuration
openldap-configuration?
(openldap openldap-configuration-openldap
(default openldap)
)
(uri openldap-configuration-uri
(default "ldapi:// ldap://")
)
(logflags openldap-configuration-logflags
(default "0")
)
(pid-file openldap-configuration-pid-file
(default "/var/run/openldap/slapd.pid")
)
(config-file openldap-configuration-config-file
(default (file-append openldap "/etc/openldap/slapd.conf"))
)
(log-file openldap-configuration-log-file
(default "/var/log/slapd.log")
)
)
(define %default-slapd.conf
(plain-file "slapd.conf" "
# Empty file for test
"))
(define schema_dir (local-file "ldap_schema" #:recursive? #t))
(define openldap-shepherd-service
(match-lambda
(($ <openldap-configuration> openldap arguments logflags log-file pid-file config-file schema-dir)
(match-lambda
(($ <openldap-configuration> openldap uri logflags pid-file config-file log-file)
(list
(shepherd-service
(provision '(slapd) )
(documentation "Run openldap.")
(requirement '(user-processes))
(respawn? #t)
(start #~(make-forkexec-constructor
(list
(shepherd-service
(provision '(slapd) )
(documentation "Run openldap.")
(requirement '(user-processes))
(respawn? #f)
(start #~(make-forkexec-constructor
(list
#$(file-append openldap-glicid "/libexec/slapd")
"-h 'ldap:/// ldaps:///'"
"-d" #$logflags
"-f" #$config-file
)
#:pid-file #$pid-file
))
(stop #~(make-kill-destructor))
)
#$(file-append openldap "/libexec/slapd")
"-h" #$uri
"-d" #$logflags
"-f" #$config-file
)
#:pid-file #$pid-file
#:log-file #$log-file
))
(stop #~(make-kill-destructor))
)
)
)
)
)
(define %openldap-activation
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils))
(mkdir-p "/var/run/openldap")
(mkdir-p "/var/lib/ldap")
#t
)
)
)
(define openldap-service-type
(service-type (name 'slapd)
(extensions
(list (
service-extension
shepherd-root-service-type
openldap-shepherd-service
))
)
(description "Run @uref{https://www.openldap.org, Openldap} community developped LDAP software.")
(service-type (name 'slapd)
(extensions
(list
(service-extension shepherd-root-service-type openldap-shepherd-service)
(service-extension activation-service-type (const %openldap-activation))
)
)
(description "Run @uref{https://www.openldap.org, Openldap} community developped LDAP software.")
)
)