[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] debian/debian-edu-config.fetch-ldap-cert: Make the script (and with it Debian...

[Mike Gabriel]

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


Commits:
0b71277d by Mike Gabriel at 2019-07-04T10:07:07Z
debian/debian-edu-config.fetch-ldap-cert: Make the script (and with it Debian Edu buster workstations) work in a Debian Edu environment where the main server (TJENER) is still on Debian Edu 8 or 9.

- - - - -


2 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -21,6 +21,11 @@ debian-edu-config (2.10.66) UNRELEASED; urgency=medium
     - Add instructions to cf3/cf.workarounds to link the 'edu-firefox-nfs' file
       to appropriate files below '/etc/X11/Xsession.d' and '/etc/profile.d'.
 
+  [ Mike Gabriel ]
+  * debian/debian-edu-config.fetch-ldap-cert: Make the script (and with it
+    Debian Edu buster workstations) work in a Debian Edu environment where
+    the main server (TJENER) is still on Debian Edu 8 or 9.
+
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 20 Apr 2019 07:53:26 +0200
 
 debian-edu-config (2.10.65) unstable; urgency=medium


=====================================
debian/debian-edu-config.fetch-ldap-cert
=====================================
@@ -39,8 +39,11 @@ do_start() {
 	    return 1
 	fi
 	[ "$VERBOSE" != no ] && log_action_begin_msg "Fetching LDAP SSL certificate."
-	if curl -k https://www.intern/debian-edu-bundle.crt > $BUNDLECRT ; then
-	gnutls-cli --x509cafile $BUNDLECRT --save-cert=$CERTFILE.new ldap.intern < /dev/null
+	if curl -f -k https://www.intern/debian-edu-bundle.crt > $BUNDLECRT ; then
+	    gnutls-cli --x509cafile $BUNDLECRT --save-cert=$CERTFILE.new ldap.intern < /dev/null
+	else
+	    /usr/share/debian-edu-config/tools/ldap-server-getcert $LDAPSERVER > $CERTFILE.new
+	    chmod 644 $CERTFILE.new
 	fi
 	if test -s $CERTFILE.new ; then
 	    mv $CERTFILE.new $CERTFILE



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/0b71277d18537322e3516ae1f373b541aaed2247

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/0b71277d18537322e3516ae1f373b541aaed2247
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/20190704/e4f7d2c9/attachment-0001.html>