[csw-devel] SF.net SVN: gar:[11354] csw/mgar/pkg/openldap/trunk/files

[gadavis at users.sourceforge.net]

Revision: 11354
          http://gar.svn.sourceforge.net/gar/?rev=11354&view=rev
Author:   gadavis
Date:     2010-10-20 23:31:48 +0000 (Wed, 20 Oct 2010)

Log Message:
-----------
Update various startup scripts to match migrateconf statement in Makefile

Modified Paths:
--------------
    csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall
    csw/mgar/pkg/openldap/trunk/files/cswopenldap
    csw/mgar/pkg/openldap/trunk/files/openldaprc

Modified: csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall	2010-10-20 22:52:43 UTC (rev 11353)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldap.postinstall	2010-10-20 23:31:48 UTC (rev 11354)
@@ -78,8 +78,8 @@
   [ -r $BASEDIR/opt/csw/etc/openldaprc ] && . $BASEDIR/opt/csw/etc/openldaprc
   [ -r $BASEDIR/etc/opt/csw/openldaprc ] && . $BASEDIR/etc/opt/csw/openldaprc
 
-  # Make sure required vars are set.  Actually these are the compiled defaults
-  DEF_SLAPD_CONFIG_FILE=$BASEDIR/opt/csw/etc/openldap/slapd.conf
+  # Make sure required vars are set.  Config directory is /etc/opt/csw/openldap
+  DEF_SLAPD_CONFIG_FILE=$BASEDIR/etc/opt/csw/openldap/slapd.conf
   SLAPD_CONFIG_FILE=${SLAPD_CONFIG_FILE:=$DEF_SLAPD_CONFIG_FILE}
   SLURPD_CONFIG_FILE=${SLURPD_CONFIG_FILE:=$DEF_SLAPD_CONFIG_FILE}
 

Modified: csw/mgar/pkg/openldap/trunk/files/cswopenldap
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/cswopenldap	2010-10-20 22:52:43 UTC (rev 11353)
+++ csw/mgar/pkg/openldap/trunk/files/cswopenldap	2010-10-20 23:31:48 UTC (rev 11354)
@@ -39,8 +39,8 @@
 [ -r /etc/opt/csw/openldaprc ] && . /etc/opt/csw/openldaprc
 
 # Make sure required vars are set.  Actually these are the compiled defaults
-DEF_SLAPD_CONFIG_FILE=/opt/csw/etc/openldap/slapd.conf
-DEF_SLAPD_CONFIG_DIR=/opt/csw/etc/openldap/slapd.d
+DEF_SLAPD_CONFIG_FILE=/etc/opt/csw/openldap/slapd.conf
+DEF_SLAPD_CONFIG_DIR=/etc/opt/csw/openldap/slapd.d
 
 # If a conf file has been created, assume we should start up.
 

Modified: csw/mgar/pkg/openldap/trunk/files/openldaprc
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/openldaprc	2010-10-20 22:52:43 UTC (rev 11353)
+++ csw/mgar/pkg/openldap/trunk/files/openldaprc	2010-10-20 23:31:48 UTC (rev 11354)
@@ -19,12 +19,12 @@
 #SLAPD_DEBUG_LEVEL=0
 
 # -f slapd-config-file. Specifies the slapd configuration file.
-#SLAPD_CONFIG_FILE=/opt/csw/etc/openldap/slapd.conf
+#SLAPD_CONFIG_FILE=/etc/opt/csw/openldap/slapd.conf
 
 # -F slapd-config-directory. Specifies the slapd configuration directory
 #  for use with the cn=config backend.
 #  You must create this directory yourself.
-#SLAPD_CONFIG_DIR=/opt/csw/etc/openldap/slapd.d
+#SLAPD_CONFIG_DIR=/etc/opt/csw/openldap/slapd.d
 
 # -g group. slapd will run with the specified group name or id.
 #SLAPD_GROUP=daemon
@@ -60,13 +60,13 @@
 #SLURPD_SYSLOG_LEVEL=0
 
 # -f slapd-config-file. Specifies the slapd configuration file.
-#SLURPD_CONFIG_FILE=/opt/csw/etc/openldap/slapd.conf
+#SLURPD_CONFIG_FILE=/etc/opt/csw/openldap/slapd.conf
 
 # -r replication-log-file.  Directory must be created.
-#SLURPD_REPL_LOG_FILE=/opt/csw/var/openldap-slurp/log
+#SLURPD_REPL_LOG_FILE=/var/opt/csw/openldap-slurp/log
 
 # -t tmp-dir.  Directory must be created.
-#SLURPD_TMP_DIR=/opt/csw/var/openldap-slurp/tmp
+#SLURPD_TMP_DIR=/var/opt/csw/openldap-slurp/tmp
 
 # -o one-shot mode
 #SLURPD_ONE_SHOT=true


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.