tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Icinga2Agent.bash: fix version comparison

Browse Source 
refs #1944
This commit is contained in:
Thomas Gelf 2019-09-26 14:27:44 +02:00
parent 2cb3d85586
commit fca63e6761
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/linux-agent-installer/Icinga2Agent.bash
View File

@ -112,14 +112,8 @@ icinga_version() {
"$ICINGA2_BIN" --version 2>/dev/null | grep -oP '\(version: [rv]?\K\d+\.\d+\.\d+[^\)]*' "$ICINGA2_BIN" --version 2>/dev/null | grep -oP '\(version: [rv]?\K\d+\.\d+\.\d+[^\)]*'
} }
icinga_major() { version() {
icinga_version | grep -oP '^\d+\.\d+' echo "$@" | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }'
}
# only can do float like versions (1.x)
version_compare() {
# args: v1 op v2
return "$(awk "BEGIN {print !($1 $2 $3)}")"
} }
# Make sure icinga2 is installed and running # Make sure icinga2 is installed and running
@ -135,7 +129,7 @@ if [ -z "${ICINGA2_SSLDIR}" ]; then
info "Using old SSL directory: ${ICINGA2_SSLDIR_OLD}" info "Using old SSL directory: ${ICINGA2_SSLDIR_OLD}"
info "Because you already have a certificate in ${ICINGA2_SSLDIR_OLD}/${ICINGA2_NODENAME}.crt" info "Because you already have a certificate in ${ICINGA2_SSLDIR_OLD}/${ICINGA2_NODENAME}.crt"
ICINGA2_SSLDIR="${ICINGA2_SSLDIR_OLD}" ICINGA2_SSLDIR="${ICINGA2_SSLDIR_OLD}"
elif version_compare "$(icinga_major)" ">=" 2.8 ; then elif [ $(version $version) -gt $(version 2.8) ]; then
info "Using new SSL directory: ${ICINGA2_SSLDIR_NEW}" info "Using new SSL directory: ${ICINGA2_SSLDIR_NEW}"
ICINGA2_SSLDIR="${ICINGA2_SSLDIR_NEW}" ICINGA2_SSLDIR="${ICINGA2_SSLDIR_NEW}"
else else