Date: Saturday, December 6, 2014 @ 02:23:29
Author: seblu
Revision: 227312
User systemd-sysusers
Added:
openldap/trunk/slapd.sysusers
Modified:
openldap/trunk/PKGBUILD
openldap/trunk/openldap.install
------------------+
PKGBUILD | 8 +++++---
openldap.install | 19 +------------------
slapd.sysusers | 1 +
3 files changed, 7 insertions(+), 21 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-12-06 00:57:51 UTC (rev 227311)
+++ PKGBUILD 2014-12-06 01:23:29 UTC (rev 227312)
@@ -11,15 +11,16 @@
makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath' 'unixodbc')
options=('!makeflags' 'emptydirs')
source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
- slapd.service slapd.tmpfiles openldap-ntlm.patch)
+ slapd.service slapd.tmpfiles slapd.sysusers openldap-ntlm.patch)
sha1sums=('0cfac3b024b99de2e2456cc7254481b6644e0b96'
'2441815efbfa01ad7a1d39068e5503b53d1d04b0'
'59241a813d7508294e4ef1cec3bfe1f5495e109d'
+ '2bf64351c32b0bf0a70663bd42de22910998b795'
'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
# see http://www.openldap.org/faq/data/cache/756.html
# there's no proper backend support for anything apart from
-# BerkeleyDB, if we don't want to drop local backend server support
+# BerkeleyDB, if we don't want to drop local backend server support
# we are forced to keep Berkeley DB here
prepare() {
@@ -63,7 +64,7 @@
popd
done
install -Dm644 doc/man/man5/ldap.conf.5.tmp
"${pkgdir}"/usr/share/man/man5/ldap.conf.5
-
+
# get rid of duplicate default conf files
rm "${pkgdir}"/etc/openldap/*.default
@@ -109,5 +110,6 @@
install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
install -Dm644 "${srcdir}"/slapd.service
"${pkgdir}"/usr/lib/systemd/system/slapd.service
install -Dm644 "${srcdir}"/slapd.tmpfiles
"${pkgdir}"/usr/lib/tmpfiles.d/slapd.conf
+ install -Dm644 "${srcdir}"/slapd.sysusers
"${pkgdir}"/usr/lib/sysusers.d/slapd.conf
install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
Modified: openldap.install
===================================================================
--- openldap.install 2014-12-06 00:57:51 UTC (rev 227311)
+++ openldap.install 2014-12-06 01:23:29 UTC (rev 227312)
@@ -1,21 +1,4 @@
post_install(){
- groupadd -g 439 ldap &>/dev/null
- useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
- chown -R ldap:ldap var/lib/openldap &>/dev/null
+ systemd-sysusers slapd.conf
systemd-tmpfiles --create slapd.conf
}
-
-post_upgrade(){
- getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null
- getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d
/var/lib/openldap -s /bin/false ldap &>/dev/null
- chown -R ldap:ldap var/lib/openldap &>/dev/null
-}
-
-post_remove(){
- if getent passwd ldap >/dev/null 2>&1; then
- userdel ldap
- fi
- if getent group ldap >/dev/null 2>&1; then
- groupdel ldap
- fi
-}
Added: slapd.sysusers
===================================================================
--- slapd.sysusers (rev 0)
+++ slapd.sysusers 2014-12-06 01:23:29 UTC (rev 227312)
@@ -0,0 +1 @@
+u ldap 439 "LDAP Server" /var/lib/openldap
