822420e2d3
Package openldap-config is added to config customized config file
of openldap.
Here is the customized change in slapd.service:
"
-After=syslog.target network-online.target
+Before=rsyncd.service
+After=network.target syslog-ng.target
-PIDFile=/var/run/openldap/slapd.pid
+PIDFile=/var/run/slapd.pid
-ExecStart=/usr/sbin/slapd -u ldap -h ${SLAPD_URLS} $SLAPD_OPTIONS
+ExecStart=/etc/init.d/openldap start
+ExecStop=/etc/init.d/openldap stop
+ExecReload=/etc/init.d/openldap restart
+RemainAfterExit=yes
"
Here is the customized change in slapd.sysconfig:
"
-#SLAPD_OPTIONS=""
+SLAPD_OPTIONS=""
"
Test:
Pass build and multi node deploy test. Confirmed related config
file is the same as before in deploy node.
Story: 2003768
Task: 26462
Depends-On: https://review.openstack.org/618440
Change-Id: I2559a8e43619449d6179ed913181052d653fa91d
Signed-off-by: slin14 <shuicheng.lin@intel.com>
67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
From 31cec68ea9c887b363dc31255fb96e88c67c4b63 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 17:11:21 -0400
|
|
Subject: [PATCH] WRS: openldap-spec-file.patch
|
|
|
|
---
|
|
SPECS/openldap.spec | 13 ++++++++-----
|
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/SPECS/openldap.spec b/SPECS/openldap.spec
|
|
index 85abac9..66a1377 100644
|
|
--- a/SPECS/openldap.spec
|
|
+++ b/SPECS/openldap.spec
|
|
@@ -245,9 +245,11 @@ pushd openldap-%{version}
|
|
--enable-backends=mod \
|
|
--enable-bdb=yes \
|
|
--enable-hdb=yes \
|
|
- --enable-mdb=yes \
|
|
+ --enable-mdb=mod \
|
|
--enable-monitor=yes \
|
|
--disable-ndb \
|
|
+ --enable-syncprov=mod \
|
|
+ --enable-ppolicy=mod \
|
|
\
|
|
--enable-overlays=mod \
|
|
\
|
|
@@ -296,7 +298,7 @@ mv check_password.so check_password.so.%{check_password_version}
|
|
ln -s check_password.so.%{check_password_version} %{buildroot}%{_libdir}/openldap/check_password.so
|
|
install -m 755 check_password.so.%{check_password_version} %{buildroot}%{_libdir}/openldap/
|
|
# install -m 644 README %{buildroot}%{_libdir}/openldap
|
|
-install -d -m 755 %{buildroot}%{_sysconfdir}/openldap
|
|
+install -d -m 740 %{buildroot}%{_sysconfdir}/openldap
|
|
cat > %{buildroot}%{_sysconfdir}/openldap/check_password.conf <<EOF
|
|
# OpenLDAP pwdChecker library configuration
|
|
|
|
@@ -432,6 +434,7 @@ exit 0
|
|
%post servers
|
|
|
|
/sbin/ldconfig -n %{_libdir}/openldap
|
|
+mkdir -p /var/lib/openldap-data
|
|
|
|
%systemd_post slapd.service
|
|
|
|
@@ -442,7 +445,6 @@ exit 0
|
|
if [ ! -f %{_sysconfdir}/openldap/slapd.d/cn=config.ldif ]; then
|
|
if [ -f %{_sysconfdir}/openldap/slapd.conf ]; then
|
|
%{_libexecdir}/openldap/convert-config.sh &>/dev/null
|
|
- mv %{_sysconfdir}/openldap/slapd.conf %{_sysconfdir}/openldap/slapd.conf.bak
|
|
else
|
|
%{_libexecdir}/openldap/convert-config.sh -f %{_datadir}/openldap-servers/slapd.ldif &>/dev/null
|
|
fi
|
|
@@ -641,8 +643,9 @@ exit 0
|
|
%{_mandir}/man5/slapd*.5*
|
|
%{_mandir}/man5/slapo-*.5*
|
|
# obsolete configuration
|
|
-%ghost %config(noreplace,missingok) %attr(0640,ldap,ldap) %{_sysconfdir}/openldap/slapd.conf
|
|
-%ghost %config(noreplace,missingok) %attr(0640,ldap,ldap) %{_sysconfdir}/openldap/slapd.conf.bak
|
|
+# %ghost %config(noreplace,missingok) %attr(0640,ldap,ldap) %{_sysconfdir}/openldap/slapd.conf
|
|
+# %ghost %config(noreplace,missingok) %attr(0640,ldap,ldap) %{_sysconfdir}/openldap/slapd.conf.bak
|
|
+%{_libdir}/openldap/back_mdb*
|
|
|
|
%files servers-sql
|
|
%doc openldap-%{version}/servers/slapd/back-sql/docs/*
|
|
--
|
|
2.7.4
|
|
|