[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: Revert "White-space-only change: Fix broken and inconsistent indentations."

[Mike Gabriel]

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config


Commits:
0bd6da24 by Mike Gabriel at 2019-08-10T14:53:51Z
Revert "White-space-only change: Fix broken and inconsistent indentations."

This reverts commit a542ec142f92d58ccc2519bc9347c3873bad9438.

- - - - -
5a337615 by Mike Gabriel at 2019-08-10T14:55:55Z
White-space-only change: Fix broken and inconsistent indentations.

- - - - -


1 changed file:

- debian/debian-edu-config.fetch-ldap-cert


Changes:

=====================================
debian/debian-edu-config.fetch-ldap-cert
=====================================
@@ -46,6 +46,7 @@ do_start() {
 		[ "$VERBOSE" != no ] && log_action_begin_msg "Fetching LDAP SSL certificate."
 
 		if echo | openssl s_client -connect "$LDAPSERVER:$LDAPPORT" 2>/dev/null | grep RootCA ; then
+
 			if curl -sfk --head -o /dev/null https://www.intern ; then
 				if curl -k https://www.intern/Debian-Edu_rootCA.crt > $ROOTCACRT && \
 						grep -q CERTIFICATE $ROOTCACRT ; then
@@ -61,15 +62,19 @@ do_start() {
 						rm -f $BUNDLECRT
 						logger -t fetch-ldap-cert "Failed to fetch certificates from www.intern."
 					fi
+				fi
 			else
 					log_action_end_msg 1
 					logger -t fetch-ldap-cert "Failed to connect to www.intern, maybe the web server down."
 					ERROR=true
 			fi
+
 		else
+
 			/usr/share/debian-edu-config/tools/ldap-server-getcert $LDAPSERVER > $CERTFILE.new
 			chmod 644 $CERTFILE.new
 			logger -t fetch-ldap-cert "Fetched pre Buster LDAP server certificate."
+
 		fi
 
 		if test -s $CERTFILE.new ; then
@@ -94,7 +99,7 @@ do_start() {
 		for ltsp_chroot in `find /opt/ltsp/ -mindepth 1 -maxdepth 1 -type d`; do
 			if [ ! -f $ltsp_chroot$CERTFILE ] && [ -f $ltsp_chroot/etc/nslcd.conf ] &&
 			    grep -q /etc/ssl/certs/debian-edu-server.crt $ltsp_chroot/etc/nslcd.conf ; then
-				[ "$VERBOSE" != no ] && 
+				[ "$VERBOSE" != no ] &&
 				log_action_begin_msg "Copying LDAP SSL certificate to ltsp-chroot $ltsp_chroot "
 				if test -s $CERTFILE; then
 					cp $CERTFILE $ltsp_chroot$CERTFILE



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/a542ec142f92d58ccc2519bc9347c3873bad9438...5a337615b58be801a13ca639b7f1e9aed6538e16

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/a542ec142f92d58ccc2519bc9347c3873bad9438...5a337615b58be801a13ca639b7f1e9aed6538e16
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20190810/61490b34/attachment-0001.html>