[SM-Commit] GIT changes to master grimoire by David Kowis (bfc8279c6360936df652e4f0db6298521f679654)

David Kowis scm at mail.sourcemage.org
Sat Nov 11 20:41:16 EST 2006


GIT changes to master grimoire by David Kowis <dkowis at shlrm.org>:

 collab/openldap/FINAL             |    6 ++++++
 collab/openldap/HISTORY           |    5 +++++
 collab/openldap/init.d/ldap.conf  |    3 ---
 collab/openldap/init.d/slapd      |   17 +++++++----------
 collab/openldap/init.d/slapd.conf |    3 +++
 5 files changed, 21 insertions(+), 13 deletions(-)

New commits:
commit bfc8279c6360936df652e4f0db6298521f679654
Author: David Kowis <dkowis at shlrm.org>
Commit: David Kowis <dkowis at shlrm.org>

    openldap
    
    Fixed up the openldap spell a bit, and renamed the irritatingly named
    /etc/sysconfig/ldap to /etc/sysconfig/slapd

diff --git a/collab/openldap/FINAL b/collab/openldap/FINAL
new file mode 100755
index 0000000..c005602
--- /dev/null
+++ b/collab/openldap/FINAL
@@ -0,0 +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
+fi
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index a8e78f6..f9156f8 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,8 @@
+2006-11-11 David Kowis <dkowis at shlrm.org>
+	* FINAL: added to move /etc/sysconfig/ldap to slapd
+	* init.d: ldap.conf/slapd.conf moved
+	* init.d: slapd, Made the init script work, don't know why sergey couldn't...
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/collab/openldap/init.d/ldap.conf b/collab/openldap/init.d/ldap.conf
deleted file mode 100644
index dfbb980..0000000
--- a/collab/openldap/init.d/ldap.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# remove ldaps part if you don't want to slapd to listen
-# on ldaps port, i.e. if ssl/tls support is not compiled in
-SLAPD_URL='ldap:/// ldaps:///'
diff --git a/collab/openldap/init.d/slapd b/collab/openldap/init.d/slapd
index bcf7fee..116b17e 100755
--- a/collab/openldap/init.d/slapd
+++ b/collab/openldap/init.d/slapd
@@ -8,17 +8,14 @@
 
 PROGRAM=/usr/libexec/slapd
 
-# There's an issue when SLAPD_URL (with spaces in value), ARGS,
-# and "$@" expansion come together in simpleinit scripts. The
-# fact that current code doesn't produce the expected result
-# (OpenLDAP listens on ldap: but not on ldaps:) is acknowledged
-# (by me, Sergey Lipnevich, as a maintainer) and I'm working on
-# resolving this. This code, however, is the best effort not to
-# produce errors during SLAPD start, so please don't change the
-# value below without testing it thoroughly.
-ARGS="'-h $SLAPD_URL'"
-
 RUNLEVEL=3
 NEEDS="+remote_fs"
 
 . /etc/init.d/smgl_init
+
+start() {
+	echo "Starting slapd...."
+	# this works, starts both of them nicely
+	$PROGRAM -h "$SLAPD_URL"
+	evaluate_retval
+}
diff --git a/collab/openldap/init.d/slapd.conf b/collab/openldap/init.d/slapd.conf
new file mode 100644
index 0000000..dfbb980
--- /dev/null
+++ b/collab/openldap/init.d/slapd.conf
@@ -0,0 +1,3 @@
+# remove ldaps part if you don't want to slapd to listen
+# on ldaps port, i.e. if ssl/tls support is not compiled in
+SLAPD_URL='ldap:/// ldaps:///'



More information about the SM-Commit mailing list