[debian-edu-commits] r81345 - in branches/wheezy/debian-edu-config: cf debian testsuite

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-05 11:01:46 +0000 (Fri, 05 Jul 2013)
New Revision: 81345

Modified:
   branches/wheezy/debian-edu-config/cf/cf.iceweasel
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/webserver
Log:
* Add test suite test to detect if
  /etc/skel/.mozilla/firefox/profiles.ini have the wrong file
  permissions (600 instead of 644).
* Correct cfengine rules creating
  /etc/skel/.mozilla/firefox/profiles.ini to make sure the file is
  given mode 644.

Modified: branches/wheezy/debian-edu-config/cf/cf.iceweasel
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.iceweasel	2013-07-05 10:56:33 UTC (rev 81344)
+++ branches/wheezy/debian-edu-config/cf/cf.iceweasel	2013-07-05 11:01:46 UTC (rev 81345)
@@ -43,5 +43,5 @@
 
 files:
 	# Ensure file file is readable by everyone
-	debian.installation.server::
+	debian.installation.server.secondpass::
 		/etc/skel/.mozilla/firefox/profiles.ini mode=a+r act=fixall

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-05 10:56:33 UTC (rev 81344)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-05 11:01:46 UTC (rev 81345)
@@ -1,8 +1,17 @@
 debian-edu-config (1.708~svn81320) UNRELEASED; urgency=low
 
+  [ Holger Levsen ]
   * Translation updates:
     - Swedish, thanks to Martin Bagge. (Closes: #714645)
 
+  [ Petter Reinholdtsen ]
+  * Add test suite test to detect if
+    /etc/skel/.mozilla/firefox/profiles.ini have the wrong file
+    permissions (600 instead of 644).
+  * Correct cfengine rules creating
+    /etc/skel/.mozilla/firefox/profiles.ini to make sure the file is
+    given mode 644.
+
  -- Holger Levsen <holger at debian.org>  Fri, 05 Jul 2013 12:55:23 +0200
 
 debian-edu-config (1.708~svn81319) wheezy-test; urgency=low

Modified: branches/wheezy/debian-edu-config/testsuite/webserver
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/webserver	2013-07-05 10:56:33 UTC (rev 81344)
+++ branches/wheezy/debian-edu-config/testsuite/webserver	2013-07-05 11:01:46 UTC (rev 81345)
@@ -2,6 +2,8 @@
 #
 # Test if the web server (apache) works.
 
+. /usr/share/debian-edu-config/testsuite-lib.sh
+
 if test -r /etc/debian-edu/config ; then
     . /etc/debian-edu/config
 fi
@@ -25,6 +27,8 @@
     echo "success: $0: Found $overridefile."
 fi    
 
+check_file_perm /etc/skel/.mozilla/firefox/profiles.ini 644
+
 # Only Main-Server profile provide webserver
 if echo "$PROFILE" | grep -q 'Main-Server' ; then
     :