rpms/openldap
5
0
Fork 0
Code Issues Pull Requests Releases Activity

don't automatically convert slapd.conf to slapd-config

Browse Source 
It is not possible to convert every possible slapd.conf to slapd-config
and expect it to work. Also, it is bad to force conversion like that.
This commit is contained in:
Jan Synacek 2014-03-04 08:52:00 +01:00
parent b3805b0a4c
commit ca7444dd1a
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openldap.spec
View File

@ -5,7 +5,7 @@
Name: openldap Name: openldap
Version: 2.4.39 Version: 2.4.39
Release: 3%{?dist} Release: 4%{?dist}
Summary: LDAP support libraries Summary: LDAP support libraries
Group: System Environment/Daemons Group: System Environment/Daemons
License: OpenLDAP License: OpenLDAP
@ -329,7 +329,6 @@ chmod 0755 %{buildroot}%{_libdir}/lib*.so*
chmod 0644 %{buildroot}%{_libdir}/lib*.*a chmod 0644 %{buildroot}%{_libdir}/lib*.*a
# slapd.conf(5) is obsoleted since 2.3, see slapd-config(5) # slapd.conf(5) is obsoleted since 2.3, see slapd-config(5)
# new configuration will be generated in %%post
mkdir -p %{buildroot}%{_datadir} mkdir -p %{buildroot}%{_datadir}
install -m 0755 -d %{buildroot}%{_datadir}/openldap-servers install -m 0755 -d %{buildroot}%{_datadir}/openldap-servers
install -m 0644 %SOURCE4 %{buildroot}%{_datadir}/openldap-servers/slapd.ldif install -m 0644 %SOURCE4 %{buildroot}%{_datadir}/openldap-servers/slapd.ldif
@ -388,14 +387,11 @@ exit 0
# generate sample TLS certificate for server (will not replace) # generate sample TLS certificate for server (will not replace)
%{_libexecdir}/openldap/generate-server-cert.sh -o &>/dev/null || : %{_libexecdir}/openldap/generate-server-cert.sh -o &>/dev/null || :
# generate/upgrade configuration # generate configuration if necessary
if [ ! -f %{_sysconfdir}/openldap/slapd.d/cn=config.ldif ]; then if [[ ! -f %{_sysconfdir}/openldap/slapd.d/cn=config.ldif && \
if [ -f %{_sysconfdir}/openldap/slapd.conf ]; then ! -f %{_sysconfdir}/openldap/slapd.conf
%{_libexecdir}/openldap/convert-config.sh &>/dev/null ]]; then
mv %{_sysconfdir}/openldap/slapd.conf %{_sysconfdir}/openldap/slapd.conf.bak
else
%{_libexecdir}/openldap/convert-config.sh -f %{_datadir}/openldap-servers/slapd.ldif &>/dev/null %{_libexecdir}/openldap/convert-config.sh -f %{_datadir}/openldap-servers/slapd.ldif &>/dev/null
fi
fi fi
start_slapd=0 start_slapd=0
@ -571,6 +567,9 @@ exit 0
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Tue Mar 4 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.39-4
- don't automatically convert slapd.conf to slapd-config
* Wed Feb 19 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.39-3 * Wed Feb 19 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.39-3
- remove redundant sysconfig-related stuff - remove redundant sysconfig-related stuff
- add documentation reference to service file - add documentation reference to service file