@@ -397,0 +447,4 @@
+            fi
+        else
+            if test -e /etc/apache2/apache2.conf; then
+                (grep --quiet --no-messages --extended-regexp "^env.url.*/server-status-[[:alnum:]]{4,}" /etc/munin/plugin-conf.d/munin-node \

@@ -441,3 +506,3 @@
     # Verification de l'activation de Squid dans le cas d'un pack mail
     if [ "$IS_SQUID" = 1 ]; then
-        squidconffile=/etc/squid*/squid.conf
+        squidconffile="/etc/squid*/squid.conf"

@@ -470,2 +543,3 @@
     if [ "$IS_LOG2MAILRUNNING" = 1 ]; then
-        is_pack_web && (is_installed log2mail && pgrep log2mail >/dev/null || echo 'IS_LOG2MAILRUNNING')
+        if is_pack_web && is_installed log2mail; then
+            pgrep log2mail >/dev/null || failed 'IS_LOG2MAILRUNNING'

@@ -478,2 +553,3 @@
         fi
-        is_pack_web && ( is_installed log2mail && grep -q "^file = /var/log/apache2/error.log" $conf 2>/dev/null || failed "IS_LOG2MAILAPACHE" )
+        if is_pack_web && is_installed log2mail; then
+            grep -q "^file = /var/log/apache2/error.log" $conf 2>/dev/null \

@@ -575,2 +680,3 @@
     if [ "$IS_SAMBAPINPRIORITY" = 1 ]; then
-        is_pack_samba && grep -qrE "^[^#].*backport" /etc/apt/sources.list{,.d} && ( priority=`grep -E -A2 "^Package:.*samba" /etc/apt/preferences |grep -A1 "^Pin: release a=lenny-backports" |grep "^Pin-Priority:" |cut -f2 -d" "` && test $priority -gt 500 || failed "IS_SAMBAPINPRIORITY" )
+        if is_pack_samba; then
+            grep -qrE "^[^#].*backport" /etc/apt/sources.list{,.d} && ( priority=$(grep -E -A2 "^Package:.*samba" /etc/apt/preferences |grep -A1 "^Pin: release a=lenny-backports" |grep "^Pin-Priority:" |cut -f2 -d" ") && test $priority -gt 500 || failed "IS_SAMBAPINPRIORITY" )

@@ -670,1 +797,3 @@
-                && grep -q '^%evolinux-sudo  ALL=(ALL:ALL) ALL' /etc/sudoers.d/evolinux) || failed "IS_EVOLINUXSUDOGROUP"
+            (grep -q "^evolinux-sudo:" /etc/group \
+                && grep -q '^%evolinux-sudo  ALL=(ALL:ALL) ALL' /etc/sudoers.d/evolinux) \
+                || failed "IS_EVOLINUXSUDOGROUP"

@@ -685,2 +814,3 @@
                 && test -L /etc/apache2/conf-enabled/zzz-evolinux-custom.conf \
-                && test -f /etc/apache2/ipaddr_whitelist.conf) || failed "IS_APACHE2EVOLINUXCONF"
+                && test -f /etc/apache2/ipaddr_whitelist.conf) \
+                || failed "IS_APACHE2EVOLINUXCONF"

@@ -701,3 +831,3 @@
     if [ "$IS_BIND9MUNIN" = 1 ]; then
         if is_debian_stretch && is_installed bind9; then
-            (test -L /etc/munin/plugins/bind9 && test -e /etc/munin/plugin-conf.d/bind9) || failed "IS_BIND9MUNIN"
+            (test -L /etc/munin/plugins/bind9 && test -e /etc/munin/plugin-conf.d/bind9) \

@@ -713,3 +844,3 @@
     if [ "$IS_BROADCOMFIRMWARE" = 1 ]; then
         if lspci | grep -q 'NetXtreme II'; then
-            (is_installed firmware-bnx2 && grep -q "^deb http://mirror.evolix.org/debian.* non-free" /etc/apt/sources.list) || failed "IS_BROADCOMFIRMWARE"
+            (is_installed firmware-bnx2 && grep -q "^deb http://mirror.evolix.org/debian.* non-free" /etc/apt/sources.list) \

@@ -722,0 +855,4 @@
+        fi
+        if lspci | grep -q 'Hewlett-Packard Company Smart Array'; then
+            is_installed cciss-vol-status \
+                || failed "IS_HARDWARERAIDTOOL"

@@ -724,3 +862,3 @@
     if [ "$IS_LOG2MAILSYSTEMDUNIT" = 1 ]; then
         if is_debian_stretch; then
-            (systemctl -q is-active log2mail.service && test -f /etc/systemd/system/log2mail.service && ! test -f /etc/init.d/log2mail) || failed "IS_LOG2MAILSYSTEMDUNIT"
+            (systemctl -q is-active log2mail.service && test -f /etc/systemd/system/log2mail.service && ! test -f /etc/init.d/log2mail) \

@@ -729,3 +868,3 @@
 
     if [ "$IS_LISTUPGRADE" = 1 ]; then
-        (test -f /etc/cron.d/listupgrade && test -x /usr/share/scripts/listupgrade.sh) || failed "IS_LISTUPGRADE"
+        (test -f /etc/cron.d/listupgrade && test -x /usr/share/scripts/listupgrade.sh) \

@@ -802,3 +947,3 @@
     if [ "$IS_MARIADBSYSTEMDUNIT" = 1 ]; then
         if is_debian_stretch && is_installed mariadb-server; then
-            (systemctl -q is-active mariadb.service && test -f /etc/systemd/system/mariadb.service.d/evolinux.conf) || failed "IS_MARIADBSYSTEMDUNIT"
+            (systemctl -q is-active mariadb.service && test -f /etc/systemd/system/mariadb.service.d/evolinux.conf) \

@@ -830,1 +974,3 @@
-                && grep -q -F "command[check_mysql]=/usr/lib/nagios/plugins/check_mysql -H localhost  -f ~nagios/.my.cnf") || failed "IS_MYSQLNRPE"
+                && [ "$(stat -c %U ~nagios/.my.cnf)" = "nagios" ] \
+                && [ "$(stat -c %a ~nagios/.my.cnf)" = "600" ] \
+                && grep -q -F "command[check_mysql]=/usr/lib/nagios/plugins/check_mysql -H localhost  -f ~nagios/.my.cnf") \

@@ -835,3 +982,3 @@
         if is_debian_stretch && is_installed php; then
             (test -f /etc/php/7.0/cli/conf.d/z-evolinux-defaults.ini \
-                && test -f /etc/php/7.0/cli/conf.d/zzz-evolinux-custom.ini) || failed "IS_PHPEVOLINUXCONF"
+                && test -f /etc/php/7.0/cli/conf.d/zzz-evolinux-custom.ini) \

@@ -373,1 +502,3 @@
-        test -d /etc/nagios && ls -ld /etc/nagios | grep -q drwxr-x--- || failed "IS_NRPEPERMS"
+        if [ -d /etc/nagios ]; then
+            actual=$(stat --format "%A" /etc/nagios)
+            expected="drwxr-x---"

@@ -397,0 +543,4 @@
+                    && test -h /etc/munin/plugins/apache_accesses \
+                    && test -h /etc/munin/plugins/apache_processes \
+                    && test -h /etc/munin/plugins/apache_volume; } \
+                    || failed "IS_APACHEMUNIN" "mising munin plugins for Apache"

@@ -493,2 +678,2 @@
-                if [ "$(md5sum /usr/sbin/named |cut -f 1 -d ' ')" != "$(md5sum /var/chroot-bind/usr/sbin/named |cut -f 1 -d ' ')" ]; then
-                    failed "IS_BINDCHROOT"
+        if is_installed bind9; then
+            if netstat -utpln | grep "/named" | grep :53 | grep -qvE "(127.0.0.1|::1)"; then

@@ -577,0 +793,4 @@
+                priority=$(grep -E -A2 "^Package:.*samba" /etc/apt/preferences | grep -A1 "^Pin: release a=.*-backports" | grep "^Pin-Priority:" | cut -f2 -d" ")
+                test "$priority" -gt 500 || failed "IS_SAMBAPINPRIORITY"
+            fi
+        fi

@@ -677,1 +947,3 @@
-                groups $user |grep -q adm || failed "IS_USERINADMGROUP"
+            users=$(grep "^evolinux-sudo:" /etc/group | awk -F: '{print $4}' | tr ',' ' ')
+            for user in $users; do
+                groups "$user" | grep -q adm || failed "IS_USERINADMGROUP" "User $user doesn't belong to \`adm' group"

@@ -1061,2 +1380,3 @@
 if [ "$IS_TMP_1777" = 1 ]; then
-    ls -ld /tmp | grep -q drwxrwxrwt || failed "IS_TMP_1777"
+    actual=$(stat --format "%A" /tmp)
+    expected="drwxrwxrwt"

@@ -1065,2 +1386,3 @@
 if [ "$IS_ROOT_0700" = 1 ]; then
-    ls -ld /root | grep -q drwx------ || failed "IS_ROOT_0700"
+    actual=$(stat --format "%A" /root)
+    expected="drwx------"

@@ -1069,2 +1392,3 @@
 if [ "$IS_USRSHARESCRIPTS" = 1 ]; then
-    ls -ld /usr/share/scripts | grep -q drwx------ || failed "IS_USRSHARESCRIPTS"
+    actual=$(stat --format "%A" /usr/share/scripts)
+    expected="drwx------"