diff options
author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-07-22 00:29:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-22 00:29:21 +0200 |
commit | fa8de76521f2de93b6b4bf6e79b0c4a3d90e6d60 (patch) | |
tree | 355aa8c955431a5f1f68e62a3c238286187a46e9 /nixos/tests | |
parent | b435482234760a1e80d04d945bb9578e7132a531 (diff) |
Revert "openldap: load client config from /etc, not the nix store"
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/openldap.nix | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index 96459d21a5efd..3c388119d5d24 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -13,17 +13,10 @@ let objectClass: organizationalUnit ou: users ''; - ldapClientConfig = { - enable = true; - loginPam = false; - nsswitch = false; - server = "ldap://"; - base = "dc=example"; - }; testScript = '' machine.wait_for_unit("openldap.service") machine.succeed( - 'ldapsearch -LLL -D "cn=root,dc=example" -w notapassword', + 'ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"', ) ''; in { @@ -64,7 +57,6 @@ in { }; declarativeContents."dc=example" = dbContents; }; - users.ldap = ldapClientConfig; }; }) { inherit pkgs system; }; @@ -84,7 +76,6 @@ in { rootpw = "notapassword"; declarativeContents."dc=example" = dbContents; }; - users.ldap = ldapClientConfig; }; }) { inherit system pkgs; }; @@ -97,7 +88,6 @@ in { enable = true; configDir = "/var/db/slapd.d"; }; - users.ldap = ldapClientConfig; }; testScript = let |