evolix
/
ansible-roles
18
2
Fork 2
Code Issues 61 Pull Requests 18 Releases 32 Wiki Activity

evocheck: upstream version 20.04.4
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Jérémy Lecour 2020-04-28 16:00:45 +02:00 committed by Jérémy Lecour
parent 57e5791728
commit 849ec405d5
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -57,7 +57,7 @@ The **patch** part changes incrementally at each release.
* bind: change name of logrotate file to bind9 * bind: change name of logrotate file to bind9
* certbot: commit hook must be executed at the end * certbot: commit hook must be executed at the end
* elasticsearch: listen on local interface only by default * elasticsearch: listen on local interface only by default
* evocheck: upstream version 20.04.3 * evocheck: upstream version 20.04.4
* evocheck: cron jobs execute in verbose * evocheck: cron jobs execute in verbose
* evolinux-base: use "evolinux_internal_group" for SSH authentication * evolinux-base: use "evolinux_internal_group" for SSH authentication
* evolinux-base: Don't customize the logcheck recipient by default. * evolinux-base: Don't customize the logcheck recipient by default.

26
evocheck/files/evocheck.sh
View File

@ -1264,18 +1264,22 @@ check_chrooted_binary_uptodate() {
done done
} }
check_nginx_letsencrypt_uptodate() { check_nginx_letsencrypt_uptodate() {
snippets=$(find /etc/nginx -type f -name "letsencrypt.conf") if [ -d /etc/nginx ]; then
while read -r snippet; do snippets=$(find /etc/nginx -type f -name "letsencrypt.conf")
if is_debian_jessie; then if [ -n "${snippets}" ]; then
if ! grep -qE "^\s*alias\s+/.+/\.well-known/acme-challenge" "${snippet}"; then while read -r snippet; do
failed "IS_NGINX_LETSENCRYPT_UPTODATE" "Nginx snippet ${snippet} is not compatible with Nginx on Debian 8." if is_debian_jessie; then
fi if ! grep -qE "^\s*alias\s+/.+/\.well-known/acme-challenge" "${snippet}"; then
else failed "IS_NGINX_LETSENCRYPT_UPTODATE" "Nginx snippet ${snippet} is not compatible with Nginx on Debian 8."
if grep -qE "^\s*alias\s+/.+/\.well-known/acme-challenge" "${snippet}"; then fi
failed "IS_NGINX_LETSENCRYPT_UPTODATE" "Nginx snippet ${snippet} is not compatible with Nginx on Debian 9+." else
fi if grep -qE "^\s*alias\s+/.+/\.well-known/acme-challenge" "${snippet}"; then
failed "IS_NGINX_LETSENCRYPT_UPTODATE" "Nginx snippet ${snippet} is not compatible with Nginx on Debian 9+."
fi
fi
done <<< "${snippets}"
fi fi
done <<< "$snippets" fi
} }
main() { main() {