evocheck: upstream version 19.09

This commit is contained in:
Jérémy Lecour 2019-09-23 09:22:58 +02:00 committed by Jérémy Lecour
parent 9f619adf68
commit 0829efc8a6
2 changed files with 3 additions and 3 deletions

View File

@ -24,7 +24,7 @@ The **patch** part changes incrementally at each release.
### Changed
* elasticsearch: listen on local interface only by default
* evocheck: upstream version 19.08
* evocheck: upstream version 19.09
* evocheck: cron jobs execute in verbose
* squid: Remove wait time when we turn off squid
* evomaintenance: Turn on API by default (instead of DB)

View File

@ -428,7 +428,7 @@ check_squid() {
if is_pack_web && (is_installed squid || is_installed squid3); then
host=$(hostname -i)
# shellcheck disable=SC2086
http_port=$(grep "http_port" $squidconffile | cut -f 2 -d " ")
http_port=$(grep -E "^http_port\s+[0-9]+" $squidconffile | awk '{ print $2 }')
{ grep -qE "^[^#]*iptables -t nat -A OUTPUT -p tcp --dport 80 -m owner --uid-owner proxy -j ACCEPT" "$MINIFW_FILE" \
&& grep -qE "^[^#]*iptables -t nat -A OUTPUT -p tcp --dport 80 -d $host -j ACCEPT" "$MINIFW_FILE" \
&& grep -qE "^[^#]*iptables -t nat -A OUTPUT -p tcp --dport 80 -d 127.0.0.(1|0/8) -j ACCEPT" "$MINIFW_FILE" \
@ -1446,7 +1446,7 @@ readonly PROGDIR=$(realpath -m "$(dirname "$0")")
# shellcheck disable=2124
readonly ARGS=$@
readonly VERSION="19.08"
readonly VERSION="19.09"
# Disable LANG*
export LANG=C