diff options
| author | Janne Heß <janne@hess.ooo> | 2022-05-20 10:20:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-20 10:20:13 +0200 |
| commit | cd139069fd40ab06aebfce9d51989e50e8b005ff (patch) | |
| tree | 530b12572eaa1d6a860a7c6db20e0c981173e709 /nixos | |
| parent | ce95d139b7365290ddd8d5e484db44469ebb10b4 (diff) | |
| parent | 885d4e047b807719996a0c497b63ab6d77eba439 (diff) | |
| download | nixpkgs-cd139069fd40ab06aebfce9d51989e50e8b005ff.tar nixpkgs-cd139069fd40ab06aebfce9d51989e50e8b005ff.tar.gz nixpkgs-cd139069fd40ab06aebfce9d51989e50e8b005ff.tar.bz2 nixpkgs-cd139069fd40ab06aebfce9d51989e50e8b005ff.tar.lz nixpkgs-cd139069fd40ab06aebfce9d51989e50e8b005ff.tar.xz nixpkgs-cd139069fd40ab06aebfce9d51989e50e8b005ff.tar.zst nixpkgs-cd139069fd40ab06aebfce9d51989e50e8b005ff.zip | |
Merge pull request #173668 from mweinelt/slapd-notify
nixos/openldap: use upstream unit defaults
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/databases/openldap.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 2c1e25d4308..1967a2371bd 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -268,9 +268,14 @@ in { }; systemd.services.openldap = { - description = "LDAP server"; + description = "OpenLDAP Server Daemon"; + documentation = [ + "man:slapd" + "man:slapd-config" + "man:slapd-mdb" + ]; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network-online.target" ]; preStart = let settingsFile = pkgs.writeText "config.ldif" (lib.concatStringsSep "\n" (attrsToLdif "cn=config" cfg.settings)); @@ -306,7 +311,7 @@ in { "${openldap}/libexec/slapd" "-u" cfg.user "-g" cfg.group "-F" configDir "-h" (lib.concatStringsSep " " cfg.urlList) ]); - Type = "forking"; + Type = "notify"; PIDFile = cfg.settings.attrs.olcPidFile; }; }; |