cf3/cf.workarounds

@@ -26,6 +26,4 @@ files:
   debian.server.installation::
     "/etc/debian-edu/www/Debian-Edu_rootCA.crt"
     copy_from => local_cp("/etc/ssl/certs/Debian-Edu_rootCA.crt");
-
-commands:
-
+}

debian/changelog

+debian-edu-config (2.11.6) UNRELEASED; urgency=medium
+
+  * cf3/cf.workarounds: Fix syntax.
+  * testsuite/icinga: Adjust after moving from icinga to icinga2 and
+    icinga2-classicui.
+  * testsuite/ltsp: Adjust after LDAP certificate setup has been reworked.
+  * testsuite/cups: Adjust now that a central ipp server is used.
+
+ -- Wolfgang Schweer <wschweer@arcor.de>  Wed, 23 Oct 2019 11:01:57 +0200
+
 debian-edu-config (2.11.5) unstable; urgency=medium
 
   [ Wolfgang Schweer ]

testsuite/cups

@@ -33,9 +33,8 @@ unset http_proxy || true
 unset https_proxy || true
 unset ftp_proxy  || true
 
-# CUPS only listens on port 631 on localhost.
-# FIXME: I assume we only need to test with https here
-for url in "http://localhost:631/" "https://localhost:631/" ; do
+# CUPS only listens on port 631 on central ipp host, not localhost.
+for url in "https://ipp:631/" ; do
     if wget -O - $WGETOPTS $url > /dev/null 2>&1 ; then
 	echo "success: $0: URL '$url' is working."
     else

testsuite/icinga

@@ -11,10 +11,15 @@ else
     exit 0
 fi
 
-if [ -x /usr/sbin/icinga ] ; then
-    echo "success: $0: Found /usr/sbin/icinga binary."
+if [ -x /usr/sbin/icinga2 ] ; then
+    echo "success: $0: Found /usr/sbin/icinga2 binary."
 else
-    echo "error: $0: Missing /usr/sbin/icinga."
+    echo "error: $0: Missing /usr/sbin/icinga2."
+fi
+if [ -f /etc/apache2/conf-enabled/icinga2-classicui.conf ] ; then
+    echo "success: $0: The icinga2-classicui web site is enabled."
+else
+    echo "error: $0: The icinga2-classicui web site is missing."
 fi
 
 

testsuite/ltsp

@@ -57,7 +57,7 @@ for LTSPARCH in amd64 i386 ; do
             error "Missing $chroot/etc/debian-edu/config"
         fi
 
-        for path in /etc/ldap/ssl/ldap-server-pubkey.pem ; do
+        for path in /etc/ssl/certs/debian-edu-server.crt ; do
 	    if cmp -s $path  $chroot$path ; then
 	        success "$path is identical inside and outside LTSP $LTSPARCH"
 	    else