Author: tchemineau
Date: 2010-09-23 12:23:44 +0200 (Thu, 23 Sep 2010)
New Revision: 135
Modified:
openldap-mmr/trunk/functions
openldap-mmr/trunk/mmr-addnode
openldap-mmr/trunk/mmr-initprov
openldap-mmr/trunk/openldap-mmr.conf
Log:
add #280 - add two parameters to configure bootstrap files to use
Modified: openldap-mmr/trunk/functions
===================================================================
--- openldap-mmr/trunk/functions 2010-09-23 10:11:19 UTC (rev 134)
+++ openldap-mmr/trunk/functions 2010-09-23 10:23:44 UTC (rev 135)
@@ -45,6 +45,8 @@
LDAP_USERNAME="ldap"
LDAP_GROUPNAME="ldap"
OPENLDAP_INSTALL_DIR="/usr/local/openldap"
+BOOTSTRAP_PROVIDER="provider.bootstrap"
+BOOTSTRAP_NODE="node.bootstrap"
# Do not forget to load the configuration file while this file is loaded. It
# will normaly override those parameters.
Modified: openldap-mmr/trunk/mmr-addnode
===================================================================
--- openldap-mmr/trunk/mmr-addnode 2010-09-23 10:11:19 UTC (rev 134)
+++ openldap-mmr/trunk/mmr-addnode 2010-09-23 10:23:44 UTC (rev 135)
@@ -41,7 +41,7 @@
# ----------------------------------------------------------------
ACTIONS=""
-DEFAULT_BOOTSTRAP="`dirname $0`/bootstrap/node.bootstrap"
+DEFAULT_BOOTSTRAP="`dirname $0`/bootstrap/${BOOTSTRAP_NODE}"
# ----------------------------------------------------------------
# FUNCTIONS
Modified: openldap-mmr/trunk/mmr-initprov
===================================================================
--- openldap-mmr/trunk/mmr-initprov 2010-09-23 10:11:19 UTC (rev 134)
+++ openldap-mmr/trunk/mmr-initprov 2010-09-23 10:23:44 UTC (rev 135)
@@ -41,7 +41,7 @@
# ----------------------------------------------------------------
ACTIONS=""
-DEFAULT_BOOTSTRAP="`dirname $0`/bootstrap/provider.bootstrap"
+DEFAULT_BOOTSTRAP="`dirname $0`/bootstrap/${BOOTSTRAP_PROVIDER}"
LDAP_NODE_IP="${LDAP_PROVIDER_IP}"
# ----------------------------------------------------------------
Modified: openldap-mmr/trunk/openldap-mmr.conf
===================================================================
--- openldap-mmr/trunk/openldap-mmr.conf 2010-09-23 10:11:19 UTC (rev
134)
+++ openldap-mmr/trunk/openldap-mmr.conf 2010-09-23 10:23:44 UTC (rev
135)
@@ -18,18 +18,6 @@
#
LDAP_PROVIDER_IP=""
#
-# Installation directories of OpenLDAP
-#
-OPENLDAP_INSTALL_DIR="/usr/local/openldap"
-OPENLDAP_DATA_DIR="$OPENLDAP_INSTALL_DIR/var/openldap-data"
-OPENLDAP_DBLOG_DIR="/usr/local/berkeleydb/openldap-logs"
-#
-# Default OpenLDAP password scheme
-# See slappasswd man page for more information
-#
-OPENLDAP_PASSWD_SCHEME="{SHA}"
-#
-#
# User that own OpenLDAP files
#
LDAP_USERNAME="ldap"
@@ -46,4 +34,23 @@
# Verify server certificates for all SSL connections
#
LDAP_TLS_REQCERT="0"
+#
+# Installation directories of OpenLDAP
+#
+OPENLDAP_INSTALL_DIR="/usr/local/openldap"
+OPENLDAP_DATA_DIR="$OPENLDAP_INSTALL_DIR/var/openldap-data"
+OPENLDAP_DBLOG_DIR="/usr/local/berkeleydb/openldap-logs"
+#
+# Default OpenLDAP password scheme
+# See slappasswd man page for more information
+#
+OPENLDAP_PASSWD_SCHEME="{SHA}"
+#
+# Provider boostrap file.
+#
+BOOTSTRAP_PROVIDER="provider.bootstrap"
+#
+# Node boostrap file.
+#
+BOOTSTRAP_NODE="node.bootstrap"
_______________________________________________
ltb-changes mailing list
[email protected]
http://lists.ltb-project.org/listinfo/ltb-changes
