[debian-edu-commits] r81165 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config testsuite
pere at alioth.debian.org
pere at alioth.debian.org
Tue Jun 25 13:08:28 UTC 2013
Author: pere
Date: 2013-06-25 13:08:28 +0000 (Tue, 25 Jun 2013)
New Revision: 81165
Modified:
branches/wheezy/debian-edu-config/debian/changelog
branches/wheezy/debian-edu-config/share/debian-edu-config/testsuite-lib.sh
branches/wheezy/debian-edu-config/testsuite/dnsd
branches/wheezy/debian-edu-config/testsuite/ldap-client
branches/wheezy/debian-edu-config/testsuite/syslog
Log:
Add testsuite code to report an error if
/etc/rsyslog.d/debian-edu-client.conf only is readable by root.
Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog 2013-06-25 10:59:26 UTC (rev 81164)
+++ branches/wheezy/debian-edu-config/debian/changelog 2013-06-25 13:08:28 UTC (rev 81165)
@@ -3,6 +3,8 @@
[ Petter Reinholdtsen ]
* Remove code from debian-edu-hwsetup to install firmware packages,
as this is also done better in auto-addfirmware.
+ * Add testsuite code to report an error if
+ /etc/rsyslog.d/debian-edu-client.conf only is readable by root.
-- Petter Reinholdtsen <pere at debian.org> Tue, 25 Jun 2013 10:37:49 +0200
Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/testsuite-lib.sh
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/testsuite-lib.sh 2013-06-25 10:59:26 UTC (rev 81164)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/testsuite-lib.sh 2013-06-25 13:08:28 UTC (rev 81165)
@@ -27,3 +27,19 @@
false
fi
}
+
+check_file_perm() {
+ file=$1
+ perm=$2
+ if [ -e $file ] ; then
+ curperm="$(stat -L -c '%a' $file)"
+ if [ $perm != "$curperm" ] ; then
+ echo "error: $file file mode is wrong, $curperm should be $perm"
+ else
+ echo "success: $file is readable by all"
+ fi
+ else
+ echo "error: Missing $file"
+ fi
+
+}
Modified: branches/wheezy/debian-edu-config/testsuite/dnsd
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/dnsd 2013-06-25 10:59:26 UTC (rev 81164)
+++ branches/wheezy/debian-edu-config/testsuite/dnsd 2013-06-25 13:08:28 UTC (rev 81165)
@@ -2,6 +2,8 @@
#
# Test if the DNS server works.
+. /usr/share/debian-edu-config/testsuite-lib.sh
+
# Ensure constent output when testing
LC_ALL=C
export LC_ALL
@@ -10,21 +12,6 @@
. /etc/debian-edu/config
fi
-check_file_perm() {
- file=$1
- perm=$2
- if [ -e $file ] ; then
- curperm="$(stat -L -c '%a' $file)"
- if [ $perm != "$curperm" ] ; then
- echo "error: $file file mode is wrong, $curperm should be $perm"
- else
- echo "success: $file is readable by all"
- fi
- else
- echo "error: Missing $file"
- fi
-
-}
check_file_perm /etc/resolv.conf 644
# In case we are a standalone profile, just exit gracefully
Modified: branches/wheezy/debian-edu-config/testsuite/ldap-client
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/ldap-client 2013-06-25 10:59:26 UTC (rev 81164)
+++ branches/wheezy/debian-edu-config/testsuite/ldap-client 2013-06-25 13:08:28 UTC (rev 81165)
@@ -219,22 +219,6 @@
fi
fi
-check_file_perm() {
- file=$1
- perm=$2
- if [ -e $file ] ; then
- curperm="$(stat -L -c '%a' $file)"
- if [ $perm != "$curperm" ] ; then
- echo "error: $file file mode is wrong, $curperm should be $perm"
- else
- echo "success: $file is readable by all"
- fi
- else
- echo "error: Missing $file"
- fi
-
-}
-
if echo "$PROFILE" | egrep -q 'Thin-Client-Server' ; then
check_file_perm \
/opt/ltsp/i386/etc/ldap/ssl/ldap-server-pubkey.pem 644
Modified: branches/wheezy/debian-edu-config/testsuite/syslog
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/syslog 2013-06-25 10:59:26 UTC (rev 81164)
+++ branches/wheezy/debian-edu-config/testsuite/syslog 2013-06-25 13:08:28 UTC (rev 81165)
@@ -42,6 +42,7 @@
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.
More information about the debian-edu-commits
mailing list