openldap: Switch to systemd sysusers mechanism for user/group creation

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --git a/openldap/openldap.nm b/openldap/openldap.nm
index 2fef95225f824aa6ab1e7ac9231c9f3fb9e7e7b3..9124ccef602ec4bb542695b211e344e958b4fe9c 100644 (file)
--- a/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@ -5,7 +5,7 @@
 
 name       = openldap
 version    = 2.6.4
-release    = 3
+release    = 4
 
 groups     = System/Daemons
 url        = https://www.openldap.org/
@@ -34,6 +34,7 @@ build
                libxcrypt-devel
                openssl-devel
                shadow-utils
+               systemd-sysusers
        end
 
        configure_options += \
@@ -50,10 +51,6 @@ build
                --enable-sql=no \
                --disable-static
 
-       prepare_cmds
-               %{create_user}
-       end
-
        # Do not strip the binaries during install.
        make_install_targets += \
                STRIP_OPTS=
@@ -101,21 +98,10 @@ build
        end
 end
 
-create_user
-       getent group ldap >/dev/null || groupadd -r ldap
-       getent passwd ldap >/dev/null || useradd -r -g ldap \
-               -d /var/lib/ldap -s /sbin/nologin -c "OpenLDAP server" ldap
-end
-
 packages
        package %{name}
                prerequires
                        openssl
-                       shadow-utils
-               end
-
-               script prein
-                       %{create_user}
                end
 
                datafiles

diff --git a/openldap/openldap.sysusers b/openldap/openldap.sysusers
new file mode 100644 (file)
index 0000000..837fa90
--- /dev/null
+++ b/openldap/openldap.sysusers
@@ -0,0 +1 @@
+u ldap - "OpenLDAP server" /var/lib/ldap /usr/sbin/nologin