Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e38399577062917924464d1cdf678f023bf343c0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e38399577062917924464d1cdf678f023bf343c0)
  • Date: Tue, 29 May 2007 03:39:39 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

collab/openldap/FINAL | 4 ++--
collab/openldap/HISTORY | 4 ++++
collab/openldap/init.d/slapd | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit e38399577062917924464d1cdf678f023bf343c0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

openldap: use INSTALL_ROOT in FINAL

commit a440087157ee8e0d9c07461be4a4cc3a5d85f96e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fix bug 13805 for openldap: source the renamed config file slapd in init
script

diff --git a/collab/openldap/FINAL b/collab/openldap/FINAL
index c005602..27edf2d 100755
--- a/collab/openldap/FINAL
+++ b/collab/openldap/FINAL
@@ -1,6 +1,6 @@
# this is for an upgrade from the /etc/sysconfig/ldap to /etc/sysconfig/slapd
# because having the wrong name is OMFGannoying

-if [ -e /etc/sysconfig/ldap ]; then
- mv /etc/sysconfig/ldap /etc/sysconfig/slapd
+if [ -e "$INSTALL_ROOT/etc/sysconfig/ldap" ]; then
+ mv "$INSTALL_ROOT/etc/sysconfig/ldap" "$INSTALL_ROOT/etc/sysconfig/slapd"
fi
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index e3f6683..de53268 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,7 @@
+2007-05-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * init.d/slapd: source slapd config, not ldap (bug 13805)
+ * FINAL: use INSTALL_ROOT when moving installed files around
+
2007-04-14 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, CONFIGURE, DEPENDS, openldap-2.3.33-contextpatch.bz2:
Add context support, see http://timof.qipc.org/ldap/libldap.html .
diff --git a/collab/openldap/init.d/slapd b/collab/openldap/init.d/slapd
index 116b17e..fd185ea 100755
--- a/collab/openldap/init.d/slapd
+++ b/collab/openldap/init.d/slapd
@@ -4,7 +4,7 @@
# SMGL-START:1 2 3 4 5:S35
# SMGL-STOP:0 6:K50

-. /etc/sysconfig/ldap
+. /etc/sysconfig/slapd

PROGRAM=/usr/libexec/slapd





Archive powered by MHonArc 2.6.24.

Top of Page