[Gforge-commits] gforge/deb-specific install-ldap.sh,1.62,1.63

[cbayle]

Update of /cvsroot/gforge/gforge/deb-specific
In directory db.perdue.net:/tmp/cvs-serv7372/deb-specific

Modified Files:
        install-ldap.sh 
Log Message:
Don't use ldap if config file is not modified


Index: install-ldap.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/install-ldap.sh,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- install-ldap.sh     21 Feb 2004 15:00:01 -0000      1.62
+++ install-ldap.sh     28 Mar 2004 19:44:54 -0000      1.63
@@ -542,21 +542,31 @@
        configure_nsswitch
        ;;
     configure)
-       setup_vars
-       # Restarting ldap
-       invoke-rc.d slapd restart
-       sleep 5         # Sometimes it takes a bit of time to get out of bed
-       check_server
-       check_base_dn
-       # echo "Setup SF_robot account"
-       setup_robot
-       # echo "Load ldap"
-       load_ldap
+       # Don't try to use ldap if config file is not changed
+       if grep -q "GForge" /etc/ldap/slapd.conf ; then
+               setup_vars
+               # Restarting ldap
+               invoke-rc.d slapd restart
+               sleep 5         # Sometimes it takes a bit of time to get out 
of bed
+               check_server
+               check_base_dn
+               # echo "Setup SF_robot account"
+               setup_robot
+               # echo "Load ldap"
+               load_ldap
+       else
+               echo "Not configuring until slapd is configured"
+       fi
        ;;
     update)
-       setup_vars
-       check_server
-       load_ldap
+       # Don't try to use ldap if config file is not changed
+       if grep -q "GForge" /etc/ldap/slapd.conf ; then
+               setup_vars
+               check_server
+               load_ldap
+       else
+               echo "Not updating until slapd is configured"
+       fi
        ;;
     purge-files)
        setup_vars