X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fldap;h=242755edcd8b393e2c7b639fbba9ec823d5cf453;hb=d15a347be54fea3ae44c595b454b22fb41149271;hp=9ec48a729a96e99da832a1f5f601fc9ee4ba254b;hpb=cfc47e5571e61f4323b9f64f9cbb64dfbc4bf1b4;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/ldap b/handlers/ldap
index 9ec48a7..242755e 100644
--- a/handlers/ldap
+++ b/handlers/ldap
@@ -1,4 +1,4 @@
-# -*- mode: sh; sh-basic-offset: 8; indent-tabs-mode: nil; -*-
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
 #
 # openldap backup handler script for backupninja
 #
@@ -12,6 +12,14 @@ getconf restart no
 getconf method ldapsearch
 getconf passwordfile
 getconf binddn
+getconf ldaphost
+getconf tls yes
+
+if [ $tls = 'yes' ]; then
+   URLBASE="ldaps"
+else
+   URLBASE="ldap"
+fi
 
 status="ok"
 
@@ -24,66 +32,74 @@ dbsuffixes=(`awk 'BEGIN {OFS=":"} /[:space:]*^database[:space:]*\w*/ {db=$2}; /^
 ## LDIF DUMP
 
 if [ "$ldif" == "yes" ]; then
-	dumpdir="$backupdir"
-	[ -d $dumpdir ] || mkdir -p $dumpdir
-
-	if [ "$databases" == 'all' ]; then
-		dbcount=`grep '^database' $conf | wc -l`
-		let "dbcount = dbcount - 1"
-		databases=`seq 0 $dbcount`;
-	fi	
-	
-	for db in $databases; do
-		if [ `expr index "$dbnum" "="` == "0" ]; then
+   dumpdir="$backupdir"
+   [ -d $dumpdir ] || mkdir -p $dumpdir
+   
+   if [ "$databases" == 'all' ]; then
+      dbcount=`grep '^database' $conf | wc -l`
+      let "dbcount = dbcount - 1"
+      databases=`seq 0 $dbcount`;
+   fi	
+   
+   for db in $databases; do
+      if [ `expr index "$dbnum" "="` == "0" ]; then
 			# db is a number, get the suffix.
-			dbsuffix=${dbsuffixes[$db]/*:/}
-		else
-			dbsuffix=$db
-		fi
+         dbsuffix=${dbsuffixes[$db]/*:/}
+      else
+         dbsuffix=$db
+      fi
 		# some databases don't have suffix (like monitor), skip these
-		if [ "$dbsuffix" == "" ]; then
-			continue;
-		fi
-
-		if [ "$method" == "slapcat" ]; then
-			execstr="$SLAPCAT -f $conf -b $dbsuffix"
-			debug "$execstr"
-		else
-			execstr="$LDAPSEARCH -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile"
-			[ -f "$passwordfile" ] || fatal "Password file $passwordfile not found. When method is set to ldapsearch, you must also specify a password file."
-			debug "$execstr"
-		fi
-		if [ ! $test ]; then
-			if [ "$restart" == "yes" ]; then
-				debug "Shutting down ldap server..."
-				/etc/init.d/slapd stop
-			fi
-
-			touch $dumpdir/$dbsuffix.ldif
-			if [ ! -f $dumpdir/$dbsuffix.ldif ]; then
-				fatal "Couldn't create ldif dump file: $dumpdir/$dbsuffix.ldif"
-			fi
-
-			output=`$execstr > $dumpdir/$dbsuffix.ldif`
-			code=$?
-			if [ "$code" == "0" ]; then
-				debug $output
-				info "Successfully finished ldif export of $dbsuffix"
-			else
-				warning $output
-				warning "Failed ldif export of $dbsuffix"
-			fi
-			if [ "$compress" == "yes" ]; then
-				output=`$GZIP -f "$dumpdir/$dbsuffix.ldif" 2>&1`
-				debug $output
-			fi
-
-			if [ "$restart" == "yes" ]; then
-				debug "Starting ldap server..."
-				/etc/init.d/slapd start
-			fi
-		fi
-	done	
+      if [ "$dbsuffix" == "" ]; then
+         continue;
+      fi
+      
+      if [ "$method" == "slapcat" ]; then
+         execstr="$SLAPCAT -f $conf -b $dbsuffix"
+         debug "$execstr"
+      else
+         if [ -n "$ldaphost" ]; then
+            execstr="$LDAPSEARCH -H $URLBASE://$ldaphost -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile"
+         else
+            execstr="$LDAPSEARCH -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile"
+         fi
+         [ -f "$passwordfile" ] || fatal "Password file $passwordfile not found. When method is set to ldapsearch, you must also specify a password file."
+         debug "$execstr"
+      fi
+      if [ ! $test ]; then
+         if [ "$restart" == "yes" ]; then
+            debug "Shutting down ldap server..."
+            /etc/init.d/slapd stop
+         fi
+         
+	 ext=
+	 if [ "$compress" == "yes" ]; then
+	    ext=".gz"
+	 fi
+         touch $dumpdir/$dbsuffix.ldif$ext
+         if [ ! -f $dumpdir/$dbsuffix.ldif$ext ]; then
+            fatal "Couldn't create ldif dump file: $dumpdir/$dbsuffix.ldif$ext"
+         fi
+         
+         if [ "$compress" == "yes" ]; then
+            output=`$execstr | $GZIP > $dumpdir/$dbsuffix.ldif.gz`
+         else
+            output=`$execstr > $dumpdir/$dbsuffix.ldif`
+         fi
+         code=$?
+         if [ "$code" == "0" ]; then
+            debug $output
+            info "Successfully finished ldif export of $dbsuffix"
+         else
+            warning $output
+            warning "Failed ldif export of $dbsuffix"
+         fi
+         
+         if [ "$restart" == "yes" ]; then
+            debug "Starting ldap server..."
+            /etc/init.d/slapd start
+         fi
+      fi
+   done	
 fi
 
 return 0