Improve/simplify regexp to support IPv6, netmasks and ignore commented lines.

This commit is contained in:
Romain Dessort 2016-05-12 12:24:55 -04:00
parent 4509f6d0e4
commit ef262a8272

View file

@ -379,7 +379,7 @@ if [ -e /etc/debian_version ]; then
if [ "$IS_APACHEIPINALLOW" = 1 ]; then
# Note: Replace "exit 1" by "print" in Perl code to debug it.
is_installed apache2.2-common && \
(grep -IrE "(Allow|Deny) from" /etc/apache2/ |grep -v "from all" |perl -ne 'exit 1 unless (/from( \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})+$/)' || echo 'IS_APACHEIPINALLOW FAILED!')
(grep -IrE "[^#] *(Allow|Deny) from" /etc/apache2/ |grep -v "from all" |perl -ne 'exit 1 unless (/from( [\da-f:.\/]+)+$/i)' || echo 'IS_APACHEIPINALLOW FAILED!')
fi
# Check if default Apache configuration file for munin is absent (or empty or commented).