[debian-edu-commits] debian-edu/ 07/07: testsuite/webserver: Dito (check presence of cert_override.txt in /etc/firefox-esr/, rather than /etc/firefox/).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch jessie
in repository debian-edu-config.

commit dff22491de9ffed1b3503e04cc614d334d92e300
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 7 12:33:34 2016 +0200

    testsuite/webserver: Dito (check presence of cert_override.txt in /etc/firefox-esr/, rather than /etc/firefox/).
    
    (cherry picked from commit 9a8b162f2ef21770a8a45f67aab1c9076122c8ef)
---
 debian/changelog    | 2 ++
 testsuite/webserver | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6c7b44d..7f9b183 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
   * kickoffrc: Use firefox-esr.desktop, rather than firefox.desktop.
   * testsuite/ltsp: Check presence of cert_override.txt in /etc/firefox-esr/,
     rather than /etc/firefox/.
+  * testsuite/webserver: Dito (check presence of cert_override.txt in /etc/firefox-esr/,
+    rather than /etc/firefox/).
 
  -- Holger Levsen <holger at debian.org>  Tue, 31 May 2016 11:23:33 +0200
 
diff --git a/testsuite/webserver b/testsuite/webserver
index 1504c59..4bfa489 100755
--- a/testsuite/webserver
+++ b/testsuite/webserver
@@ -20,7 +20,7 @@ if [ -e "$skeloverride" ] && [ -h "$skeloverride" ] ; then
     echo "error: $0: Found symlink in $skeloverride."
 fi
 
-overridefile=/etc/firefox/profile/cert_override.txt
+overridefile=/etc/firefox-esr/profile/cert_override.txt
 if [ ! -f "$overridefile" ] ; then
     echo "error: $0: Missing $overridefile."
 else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git