From bf1a39e9e1d094a1a871c81032d9efcce7119bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= <bserie@evolix.fr>
Date: Fri, 12 Apr 2013 18:03:48 +0200
Subject: [PATCH] Adding support for Wheezy-evolinux.

---
 evocheck.sh | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/evocheck.sh b/evocheck.sh
index ab55191..d20f093 100755
--- a/evocheck.sh
+++ b/evocheck.sh
@@ -107,6 +107,37 @@ is_installed(){
 
 if [ -e /etc/debian_version ]; then
 
+     # Proper to Squeeze or Wheezy version.
+    if [ $(lsb_release -c -s) = "squeeze" ]; then
+        if [ "$IS_DPKGWARNING" = 1 ] && ( [ "$IS_USRRO" = 1 ] || [ "$IS_TMPNOEXEC" = 1 ] ); then
+            egrep -i "(Pre-Invoke ..echo Are you sure to have rw on|Post-Invoke ..echo Dont forget to mount -o remount)" \
+                /etc/apt/apt.conf | wc -l | grep -q ^2$ || \
+                echo 'IS_DPKGWARNING FAILED!'
+        fi
+
+        if [ "$IS_CUSTOMSUDOERS" = 1 ]; then
+            egrep -q "env_reset,.*umask=0077" /etc/sudoers || \
+                echo 'IS_CUSTOMSUDOERS FAILED!'
+        fi
+
+        if [ "$IS_UMASKSUDOERS" = 1 ]; then
+            grep -q ^Defaults.*umask=0077 /etc/sudoers || echo 'IS_UMASKSUDOERS FAILED!'
+        fi
+    fi
+
+    if [ $(lsb_release -c -s) = "wheezy" ]; then
+        if [ "$IS_DPKGWARNING" = 1 ] && ( [ "$IS_USRRO" = 1 ] || [ "$IS_TMPNOEXEC" = 1 ] ); then
+            test -e /etc/apt/apt.conf.d/80evolinux || \
+                echo 'IS_DPKGWARNING FAILED!'
+        fi
+
+        if [ "$IS_CUSTOMSUDOERS" = 1 ]; then
+            egrep -q "Defaults.*umask=0077" /etc/sudoers.d/evolinux || \
+                echo 'IS_CUSTOMSUDOERS FAILED!'
+        fi
+    fi
+
+    # Compatible Squeeze & Wheezy.
     if [ "$IS_VARTMPFS" = 1 ]; then
         df /var/tmp | grep -q tmpfs || echo 'IS_VARTMPFS FAILED!'
     fi
@@ -143,18 +174,10 @@ if [ -e /etc/debian_version ]; then
         egrep "(which=both|confirm=1)" /etc/apt/listchanges.conf | wc -l | grep -q ^2$ || echo 'IS_LISTCHANGESCONF FAILED!'
     fi
     
-    if [ "$IS_DPKGWARNING" = 1 ] && ( [ "$IS_USRRO" = 1 ] || [ "$IS_TMPNOEXEC" = 1 ] ); then
-        egrep -i "(Pre-Invoke ..echo Are you sure to have rw on|Post-Invoke ..echo Dont forget to mount -o remount)" /etc/apt/apt.conf | wc -l | grep -q ^2$ || echo 'IS_DPKGWARNING FAILED!'
-    fi
-    
     if [ "$IS_CUSTOMCRONTAB" = 1 ]; then
         egrep "^(17 \*|25 6|47 6|52 6)" /etc/crontab | wc -l | grep -q ^4$ && echo 'IS_CUSTOMCRONTAB FAILED!'
     fi
     
-    if [ "$IS_CUSTOMSUDOERS" = 1 ]; then
-        egrep -q "env_reset,.*umask=0077" /etc/sudoers || echo 'IS_CUSTOMSUDOERS FAILED!'
-    fi
-    
     if [ "$IS_SSHALLOWUSERS" = 1 ]; then
         egrep -qi "AllowUsers" /etc/ssh/sshd_config || echo 'IS_SSHALLOWUSERS FAILED!'
     fi
@@ -198,10 +221,6 @@ if [ -e /etc/debian_version ]; then
         uname -a | grep -q grsec && ( grep -q ^command.check_total_procs..sudo /etc/nagios/nrpe.cfg && grep -A1 "^\[processes\]" /etc/munin/plugin-conf.d/munin-node | grep -q "^user root" || echo 'IS_GRSECPROCS FAILED!' )
     fi
     
-    if [ "$IS_UMASKSUDOERS" = 1 ]; then
-        grep -q ^Defaults.*umask=0077 /etc/sudoers || echo 'IS_UMASKSUDOERS FAILED!'
-    fi
-    
     if [ "$IS_APACHEMUNIN" = 1 ]; then
         test -e /etc/apache2/apache2.conf && ( egrep -q "^env.url.*/server-status-[[:alnum:]]{4}" /etc/munin/plugin-conf.d/munin-node && egrep -q "/server-status-[[:alnum:]]{4}" /etc/apache2/apache2.conf || egrep -q "/server-status-[[:alnum:]]{4}" /etc/apache2/apache2.conf /etc/apache2/mods-enabled/status.conf 2>/dev/null || echo 'IS_APACHEMUNIN FAILED!' )
     fi