forked from jengelh/openldap2
Accepting request 826785 from network:ldap
OBS-URL: https://build.opensuse.org/request/show/826785 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=155
This commit is contained in:
commit
333ac0b63f
@ -1,7 +0,0 @@
|
|||||||
set_cachesize 0 15000000 1
|
|
||||||
set_lg_regionmax 262144
|
|
||||||
set_lg_bsize 2097152
|
|
||||||
set_lk_max_locks 30000
|
|
||||||
set_lk_max_objects 30000
|
|
||||||
set_flags DB_LOG_AUTOREMOVE
|
|
||||||
|
|
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Aug 15 06:56:27 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
|
||||||
|
|
||||||
|
- Drop obsolete, not working DB_CONFIG
|
||||||
|
- Remove init.d header from start script, does not work
|
||||||
|
- Use bash for start script as syntax is not POSIX sh supported
|
||||||
|
- Remove UPDATE_NEEDED section in start script, does never match
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Aug 15 06:36:43 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
|
||||||
|
|
||||||
|
- Remove remaining rc.status usage in start script
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Aug 12 06:16:42 UTC 2020 - Michael Ströder <michael@stroeder.com>
|
Wed Aug 12 06:16:42 UTC 2020 - Michael Ströder <michael@stroeder.com>
|
||||||
|
|
||||||
|
@ -1,3 +1,2 @@
|
|||||||
# openldap needs a directory in /var/lib/:
|
# openldap needs a directory in /var/lib/:
|
||||||
d /var/lib/ldap 0750 ldap ldap -
|
d /var/lib/ldap 0750 ldap ldap -
|
||||||
L /var/lib/ldap/DB_CONFIG - - - - ../../../usr/lib/openldap/
|
|
||||||
|
@ -44,7 +44,6 @@ URL: https://www.openldap.org
|
|||||||
Source: https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-%{version_main}.tgz
|
Source: https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-%{version_main}.tgz
|
||||||
Source1: slapd.conf
|
Source1: slapd.conf
|
||||||
Source2: slapd.conf.olctemplate
|
Source2: slapd.conf.olctemplate
|
||||||
Source3: DB_CONFIG
|
|
||||||
Source4: sasl-slapd.conf
|
Source4: sasl-slapd.conf
|
||||||
Source5: README.module-loading
|
Source5: README.module-loading
|
||||||
Source6: schema2ldif
|
Source6: schema2ldif
|
||||||
@ -369,7 +368,6 @@ install -m 755 %{SOURCE6} %{buildroot}%{_sbindir}/schema2ldif
|
|||||||
install -m 755 %{SOURCE17} %{buildroot}%{_sbindir}
|
install -m 755 %{SOURCE17} %{buildroot}%{_sbindir}
|
||||||
mkdir -p %{buildroot}%{_tmpfilesdir}/
|
mkdir -p %{buildroot}%{_tmpfilesdir}/
|
||||||
install -m 644 %{SOURCE18} %{buildroot}%{_tmpfilesdir}/
|
install -m 644 %{SOURCE18} %{buildroot}%{_tmpfilesdir}/
|
||||||
install -m 644 %{SOURCE3} %{buildroot}/usr/lib/openldap/
|
|
||||||
|
|
||||||
# Install ppolicy check module
|
# Install ppolicy check module
|
||||||
make -C contrib/slapd-modules/ppolicy-check-password STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install
|
make -C contrib/slapd-modules/ppolicy-check-password STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install
|
||||||
@ -473,7 +471,6 @@ fi
|
|||||||
%config(noreplace) %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.olctemplate
|
%config(noreplace) %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.olctemplate
|
||||||
%config %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.default
|
%config %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.default
|
||||||
%config %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.example
|
%config %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.example
|
||||||
%config(noreplace) %attr(640, ldap, ldap) /usr/lib/openldap/DB_CONFIG
|
|
||||||
%dir %{_libdir}/openldap
|
%dir %{_libdir}/openldap
|
||||||
%dir /usr/lib/openldap
|
%dir /usr/lib/openldap
|
||||||
%dir %{_sysconfdir}/sasl2
|
%dir %{_sysconfdir}/sasl2
|
||||||
|
38
start
38
start
@ -1,4 +1,4 @@
|
|||||||
#! /bin/sh
|
#! /bin/bash
|
||||||
# Copyright (c) 1997-2000 SuSE GmbH Nuernberg, Germany.
|
# Copyright (c) 1997-2000 SuSE GmbH Nuernberg, Germany.
|
||||||
# Copyright (c) 2002 SuSE Linux AG Nuernberg, Germany.
|
# Copyright (c) 2002 SuSE Linux AG Nuernberg, Germany.
|
||||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
@ -6,18 +6,6 @@
|
|||||||
# Author: Carsten Hoeger
|
# Author: Carsten Hoeger
|
||||||
# Ralf Haferkamp
|
# Ralf Haferkamp
|
||||||
#
|
#
|
||||||
# /etc/init.d/ldap
|
|
||||||
#
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: ldap
|
|
||||||
# Required-Start: $network $remote_fs
|
|
||||||
# Required-Stop: $network $remote_fs
|
|
||||||
# Default-Start: 3 5
|
|
||||||
# Default-Stop: 0 1 2 6
|
|
||||||
# Short-Description: OpenLDAP Server (slapd)
|
|
||||||
# Description: Start and Stop the OpenLDAP Server (slapd) to
|
|
||||||
# provide LDAP directory services.
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
# Determine the base and follow a runlevel link name.
|
# Determine the base and follow a runlevel link name.
|
||||||
base=${0##*/}
|
base=${0##*/}
|
||||||
@ -34,20 +22,6 @@ SLAPD_PID_DIR="/var/run/slapd/"
|
|||||||
|
|
||||||
test -x $SLAPD_BIN || exit 5
|
test -x $SLAPD_BIN || exit 5
|
||||||
|
|
||||||
# Shell functions sourced from /etc/rc.status:
|
|
||||||
# rc_check check and set local and overall rc status
|
|
||||||
# rc_status check and set local and overall rc status
|
|
||||||
# rc_status -v ditto but be verbose in local rc status
|
|
||||||
# rc_status -v -r ditto and clear the local rc status
|
|
||||||
# rc_failed set local and overall rc status to failed
|
|
||||||
# rc_failed <num> set local and overall rc status to <num><num>
|
|
||||||
# rc_reset clear local rc status (overall remains)
|
|
||||||
# rc_exit exit appropriate to overall rc status
|
|
||||||
. /etc/rc.status
|
|
||||||
|
|
||||||
# First reset status of this service
|
|
||||||
rc_reset
|
|
||||||
|
|
||||||
function init_ldap_listener_urls(){
|
function init_ldap_listener_urls(){
|
||||||
case "$OPENLDAP_START_LDAP" in
|
case "$OPENLDAP_START_LDAP" in
|
||||||
[Yy][Ee][Ss])
|
[Yy][Ee][Ss])
|
||||||
@ -142,16 +116,6 @@ GROUP_CMD=""
|
|||||||
[ ! "x$OPENLDAP_CONFIG_BACKEND" = "xldap" ] && SLAPD_CONFIG_ARG="-f /etc/openldap/slapd.conf"
|
[ ! "x$OPENLDAP_CONFIG_BACKEND" = "xldap" ] && SLAPD_CONFIG_ARG="-f /etc/openldap/slapd.conf"
|
||||||
|
|
||||||
|
|
||||||
if [ -f /etc/openldap/UPDATE_NEEDED ]; then
|
|
||||||
rc_failed 6
|
|
||||||
echo " The configuration of your LDAP server needs to be updated."
|
|
||||||
echo " Please see /usr/share/doc/packages/openldap2/README.update"
|
|
||||||
echo " for details."
|
|
||||||
echo " After the update please remove the file:"
|
|
||||||
echo " /etc/openldap/UPDATE_NEEDED"
|
|
||||||
rc_status -v
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
# chown backend directories if OPENLDAP_CHOWN_DIRS ist set
|
# chown backend directories if OPENLDAP_CHOWN_DIRS ist set
|
||||||
if [ "$(echo "$OPENLDAP_CHOWN_DIRS" | tr 'A-Z' 'a-z')" = "yes" ]; then
|
if [ "$(echo "$OPENLDAP_CHOWN_DIRS" | tr 'A-Z' 'a-z')" = "yes" ]; then
|
||||||
if [ -n "$OPENLDAP_USER" -o -n "$OPENLDAP_GROUP" ]; then
|
if [ -n "$OPENLDAP_USER" -o -n "$OPENLDAP_GROUP" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user