[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Remove BUNDLECRT file if ROOTCACRT file has been downloaded.

[WolfgangSchweer]

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


Commits:
9dad2e49 by Wolfgang Schweer at 2019-08-10T18:13:41Z
Remove BUNDLECRT file if ROOTCACRT file has been downloaded.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


1 changed file:

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


Changes:

=====================================
debian/debian-edu-config.fetch-ldap-cert
=====================================
@@ -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
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/9dad2e493587c02231b36b8cf426838d737a98fe

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/9dad2e493587c02231b36b8cf426838d737a98fe
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/feaadad3/attachment-0001.html>