Commit 9dad2e49 authored by Wolfgang Schweer's avatar Wolfgang Schweer
Browse files

Remove BUNDLECRT file if ROOTCACRT file has been downloaded. 



Signed-off-by: default avatarWolfgang Schweer <wschweer@arcor.de>
parent 567ed6d7

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

+5 −5
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ do_start() { 
					gnutls-cli --x509cafile $ROOTCACRT --save-cert=$CERTFILE.new $LDAPSERVER < /dev/null 1>/dev/null 2>/dev/null

					logger -t fetch-ldap-cert "Fetched rootCA certificate from www.intern."



					# FIXME: If the host previously had got the BUNDLECERT file installed,

					# we should make sure here to have it removed. From now on, the LTSP chroot

					# If the host previously had got the BUNDLECERT file installed,

					# we make sure here to have it removed. From now on, the LTSP chroot

					# can operate on the ROOTCACRT file and the BUNDLECERT will never get

					# update anymore once the ROOTCACRT is available on www.intern.



					rm -f $BUNDLECRT

				else



					# If there is no Debian Edu RootCA available on www.intern, fallback to
@@ -204,11 +204,11 @@ do_start() { 
					log_action_begin_msg "Copying Debian Edu rootCA certificate to ltsp-chroot $ltsp_chroot "

					if test -s $ROOTCACRT; then



						# FIXME: If the chroot previously had got the BUNDLECERT file installed,

						# If the chroot previously had got the BUNDLECERT file installed,

						# we should make sure here to have it removed. From now on, the LTSP chroot

						# can operate on the ROOTCACRT file and the BUNDLECERT will never get

						# update anymore once the ROOTCACRT is available on www.intern.



						rm -f $ltsp_chroot$BUNDLECRT

						cp $ROOTCACRT $ltsp_chroot$ROOTCACRT

						[ "$VERBOSE" != no ] && log_action_end_msg 0