From e985a277b350147d519af991b8ae962e58ff2235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 23 Sep 2021 20:32:09 +0200
Subject: [PATCH] migrate to new openldap module syntax

---
 flake.nix | 109 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 56 insertions(+), 53 deletions(-)

diff --git a/flake.nix b/flake.nix
index 86343847..bdf30fa9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -851,60 +851,63 @@
             machine = { pkgs, ... }: {
               imports = [ hydraServer ];
 
-              services.openldap = {
-                enable = true;
-                suffix = "dc=example";
-                rootdn = "cn=root,dc=example";
-                rootpw = "notapassword";
-                database = "bdb";
-                dataDir = "/var/lib/openldap";
-
-                # userPassword generated via `slappasswd`
-                # The admin user has the password `password` and `user` has the password `foobar`.
-                declarativeContents."dc=example" = ''
-                  dn: dc=example
-                  dc: example
-                  o: Root
-                  objectClass: top
-                  objectClass: dcObject
-                  objectClass: organization
-
-                  dn: ou=users,dc=example
-                  ou: users
-                  description: All users
-                  objectClass: top
-                  objectClass: organizationalUnit
-
-                  dn: ou=groups,dc=example
-                  ou: groups
-                  description: All groups
-                  objectClass: top
-                  objectClass: organizationalUnit
-
-                  dn: cn=hydra_admin,ou=groups,dc=example
-                  cn: hydra_admin
-                  description: Hydra Admin user group
-                  objectClass: groupOfNames
-                  member: cn=admin,ou=users,dc=example
-
-                  dn: cn=user,ou=users,dc=example
-                  objectClass: organizationalPerson
-                  objectClass: inetOrgPerson
-                  sn: user
-                  cn: user
-                  mail: user@example
-                  userPassword: {SSHA}gLgBMb86/3wecoCp8gtORgIF2/qCRpqs
-
-                  dn: cn=admin,ou=users,dc=example
-                  objectClass: organizationalPerson
-                  objectClass: inetOrgPerson
-                  sn: admin
-                  cn: admin
-                  mail: admin@example
-                  userPassword: {SSHA}BsgOQcRnoiULzwLrGmuzVGH6EC5Dkwmf
-                '';
+              services.openldap.enable = true;
+              services.openldap.settings.children = {
+                "olcDatabase={1}mdb".attrs = {
+                  objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ];
+                  database = "{1}mdbg";
+                  olcSuffix = "dc=example";
+                  olcRootDN = "cn=root,dc=example";
+                  olcRootPW = "notapassword";
+                  olcDbDirectory = "/var/lib/openldap";
+                };
               };
-              systemd.services.hdyra-server.environment.CATALYST_DEBUG = "1";
+
+              # userPassword generated via `slappasswd`
+              # The admin user has the password `password` and `user` has the password `foobar`.
+              services.openldap.declarativeContents."dc=example" = ''
+                dn: dc=example
+                dc: example
+                o: Root
+                objectClass: top
+                objectClass: dcObject
+                objectClass: organization
+
+                dn: ou=users,dc=example
+                ou: users
+                description: All users
+                objectClass: top
+                objectClass: organizationalUnit
+
+                dn: ou=groups,dc=example
+                ou: groups
+                description: All groups
+                objectClass: top
+                objectClass: organizationalUnit
+
+                dn: cn=hydra_admin,ou=groups,dc=example
+                cn: hydra_admin
+                description: Hydra Admin user group
+                objectClass: groupOfNames
+                member: cn=admin,ou=users,dc=example
+
+                dn: cn=user,ou=users,dc=example
+                objectClass: organizationalPerson
+                objectClass: inetOrgPerson
+                sn: user
+                cn: user
+                mail: user@example
+                userPassword: {SSHA}gLgBMb86/3wecoCp8gtORgIF2/qCRpqs
+
+                dn: cn=admin,ou=users,dc=example
+                objectClass: organizationalPerson
+                objectClass: inetOrgPerson
+                sn: admin
+                cn: admin
+                mail: admin@example
+                userPassword: {SSHA}BsgOQcRnoiULzwLrGmuzVGH6EC5Dkwmf
+              '';
+              systemd.services.hydra-server.environment.CATALYST_DEBUG = "1";
               systemd.services.hydra-server.environment.HYDRA_LDAP_CONFIG = pkgs.writeText "config.yaml"
                 # example config based on https://metacpan.org/source/ILMARI/Catalyst-Authentication-Store-LDAP-1.016/README#L103
                 ''