diff --git a/glicid/services/openldap.scm b/glicid/services/openldap.scm index 347c4ea..6bb99ae 100644 --- a/glicid/services/openldap.scm +++ b/glicid/services/openldap.scm @@ -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,7 +8,6 @@ #: export ( openldap-configuration openldap-configuration? - %default-slapd.conf openldap-shepherd-service openldap-service-type ) @@ -30,18 +29,13 @@ (default "/var/run/openldap/slapd.pid") ) (config-file openldap-configuration-config-file - (default %default-slapd.conf) + (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 openldap-shepherd-service (match-lambda (($ openldap uri logflags pid-file config-file log-file) @@ -50,7 +44,7 @@ (provision '(slapd) ) (documentation "Run openldap.") (requirement '(user-processes)) - (respawn? #f) + (respawn? #t) (start #~(make-forkexec-constructor (list #$(file-append openldap "/libexec/slapd")