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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-28 10:10:45 +0000 (Fri, 28 Jun 2013)
New Revision: 81234

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/syslog
Log:
Correct rsyslog test suite check to no look for the client
configuration on the Main Server.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-28 10:07:48 UTC (rev 81233)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-28 10:10:45 UTC (rev 81234)
@@ -3,6 +3,8 @@
   [ Petter Reinholdtsen ]
   * Quiet down run-at-firstboot, avoid lots of messages from munin
     automatic configuration failures.
+  * Correct rsyslog test suite check to no look for the client
+    configuration on the Main Server.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 28 Jun 2013 12:07:11 +0200
 

Modified: branches/wheezy/debian-edu-config/testsuite/syslog
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/syslog	2013-06-28 10:07:48 UTC (rev 81233)
+++ branches/wheezy/debian-edu-config/testsuite/syslog	2013-06-28 10:10:45 UTC (rev 81234)
@@ -35,6 +35,7 @@
         echo "success: $0: Main-Server is not forwarding syslog messages to @syslog"
     fi
 else # not Main-server or Standalone, should forward
+    check_file_perm /etc/rsyslog.d/debian-edu-client.conf 644
     if [ true = $forwarding ] ; then
         echo "success: $0: rsyslog is forwarding syslog messages to @syslog"
     else
@@ -42,8 +43,6 @@
     fi
 fi
 
-check_file_perm /etc/rsyslog.d/debian-edu-client.conf 644
-
 # Only Main-Server and Thin-Client-Server should accept syslog
 # messages from the net.