From 68ea07c9196c3ed4cef06c96b38cc56f2a7c924e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= <bserie@evolix.fr>
Date: Wed, 8 Oct 2014 12:18:36 +0200
Subject: [PATCH] Revert "Merge conflicts."

This reverts commit 534cb10a1be7822c2245ef81775b9f6d348307d6.

Due to 9d2844ce1a95926c420fe5199d879c11f91bc4e6.

Conflicts:
	evocheck.sh
---
 evocheck.sh | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/evocheck.sh b/evocheck.sh
index 1ea5787..2bcd759 100755
--- a/evocheck.sh
+++ b/evocheck.sh
@@ -140,19 +140,7 @@ if [ -e /etc/debian_version ]; then
             test -e /etc/apt/apt.conf.d/80evolinux || \
                 echo 'IS_DPKGWARNING FAILED!'
         fi
-
-        if [ "$IS_CUSTOMSUDOERS" = 1 ]; then
-            egrep -qs "Defaults.*umask=0077" /etc/sudoers /etc/sudoers.d/evolinux || \
-                echo 'IS_CUSTOMSUDOERS FAILED!'
-        fi
-        
-        # Verifying check_mailq in Nagios NRPE config file. (Option "-M postfix" need to be set if the MTA is Postfix)
-        if [ "$IS_NRPEPOSTFIX" = 1 ]; then
-            is_installed postfix && \
-                (grep -qs "^command.*check_mailq -M postfix" /etc/nagios/nrpe.cfg /etc/nagios/nrpe.d/evolix.cfg || \
-                    echo 'IS_NRPEPOSTFIX FAILED!')
-        fi
-
+    
         # Check if mod-security config file is present.
         if [ "$IS_MODSECURITY" = 1 ]; then
            is_installed libapache2-modsecurity && \