evolix/evocheck
evolix/evocheck
21
2
Fork 2
Code Issues 48 Pull requests 5 Releases 37 Wiki Activity

Optimize OS/release/version detection for faster execution #70

Merged
benpro merged 86 commits from fast-debian-check into master 2019-04-05 11:01:57 +02:00
Conversation 5 Commits 86 Files changed 1 +11 -11
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d51c64d410 - Show all commits

22
evocheck.sh
View file

@ -437,20 +437,20 @@ if is_debian; then
fi fi
if [ "$IS_APACHEMUNIN" = 1 ]; then if [ "$IS_APACHEMUNIN" = 1 ]; then
if is_debian_stretch; then if test -e /etc/apache2/apache2.conf; then
if test -e /etc/apache2/apache2.conf; then if is_debian_stretch; then
(test -h /etc/apache2/mods-enabled/status.load \ { test -h /etc/apache2/mods-enabled/status.load \
&& test -h /etc/munin/plugins/apache_accesses \ && test -h /etc/munin/plugins/apache_accesses \
&& test -h /etc/munin/plugins/apache_processes \ && test -h /etc/munin/plugins/apache_processes \
&& test -h /etc/munin/plugins/apache_volume) \ && test -h /etc/munin/plugins/apache_volume; } \
|| failed "IS_APACHEMUNIN" "mising munin plugins for Apache" || failed "IS_APACHEMUNIN" "mising munin plugins for Apache"
fi else
else pattern="/server-status-[[:alnum:]]{4,}"
if test -e /etc/apache2/apache2.conf; then { grep -q -s -E "^env.url.*${pattern}" /etc/munin/plugin-conf.d/munin-node \
(grep --quiet --no-messages --extended-regexp "^env.url.*/server-status-[[:alnum:]]{4,}" /etc/munin/plugin-conf.d/munin-node \ && { grep -q -s -E "${pattern}" /etc/apache2/apache2.conf \
&& (grep --quiet --no-messages --extended-regexp "/server-status-[[:alnum:]]{4,}" /etc/apache2/apache2.conf \ || grep -q -s -E "${pattern}" /etc/apache2/mods-enabled/status.conf;
|| grep --quiet --no-messages --extended-regexp "/server-status-[[:alnum:]]{4,}" /etc/apache2/mods-enabled/status.conf)) \ };
|| failed "IS_APACHEMUNIN" "server status is not properly configured" } || failed "IS_APACHEMUNIN" "server status is not properly configured"
fi fi
fi fi
fi fi