Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ed44757900 | |||
| 340283c0a9 | |||
| f4365d32e5 |
+1
-1
@@ -1 +1 @@
|
|||||||
1.8.8.F1,build script fix, host checking improving
|
1.8.8.F3,syntax fix
|
||||||
|
|||||||
@@ -5,12 +5,11 @@
|
|||||||
# "users": ["oleg"],
|
# "users": ["oleg"],
|
||||||
# "type": "cloud",
|
# "type": "cloud",
|
||||||
# "ssh_port": 7822,
|
# "ssh_port": 7822,
|
||||||
# # "to_check": false
|
# "to_check": "false"
|
||||||
# "timeout_sec": 5
|
# "timeout_sec": 5
|
||||||
# },
|
# },
|
||||||
|
|
||||||
RootDir="${HOME}/prod"
|
RootDir="${HOME}/prod"
|
||||||
# RootDir=/home/oleg/develop/cvtt2 ###### D E B U G
|
|
||||||
|
|
||||||
AlertChannel=Alerts-CVTT
|
AlertChannel=Alerts-CVTT
|
||||||
Sender=${RootDir}/ops/utils/send_mmost.sh
|
Sender=${RootDir}/ops/utils/send_mmost.sh
|
||||||
@@ -48,6 +47,7 @@ User=oleg
|
|||||||
Hosts=()
|
Hosts=()
|
||||||
DEFAULT_SSH_PORT=22
|
DEFAULT_SSH_PORT=22
|
||||||
DEFAULT_TIMEOUT=5
|
DEFAULT_TIMEOUT=5
|
||||||
|
DEFAULT_TO_CHECK="true"
|
||||||
Domains=("${Domains[@]}" "$(get_domains)")
|
Domains=("${Domains[@]}" "$(get_domains)")
|
||||||
|
|
||||||
for Domain in ${Domains[@]} ; do
|
for Domain in ${Domains[@]} ; do
|
||||||
@@ -58,19 +58,18 @@ for Host in ${Hosts[@]} ; do
|
|||||||
host=$(echo $Host | cut -d'.' -f1)
|
host=$(echo $Host | cut -d'.' -f1)
|
||||||
Domain=$(echo $Host | cut -d'.' -f2-)
|
Domain=$(echo $Host | cut -d'.' -f2-)
|
||||||
|
|
||||||
# ToCheck=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].to_check // "Yes"')
|
|
||||||
# if [ "${ToCheck^^}" == "NO" ]; then
|
|
||||||
# continue
|
|
||||||
# fi
|
|
||||||
ToCheck=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].to_check // true')
|
|
||||||
if [ "$ToCheck" != "true" ]; then
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
PortSSH=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].ssh_port // '"$DEFAULT_SSH_PORT"'')
|
PortSSH=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].ssh_port // '"$DEFAULT_SSH_PORT"'')
|
||||||
|
|
||||||
Timeout=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].timeout_sec // '"$DEFAULT_TIMEOUT"'')
|
Timeout=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].timeout_sec // '"$DEFAULT_TIMEOUT"'')
|
||||||
echo "Checking host: $Host on port $PortSSH"
|
|
||||||
|
ToCheck=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].to_check // '"$DEFAULT_TO_CHECK"'')
|
||||||
|
to_check="${ToCheck^^}"
|
||||||
|
if [ "${to_check}" == "TRUE" -o "${to_check}" == "YES" -o "${to_check}" == "Y" -o "${to_check}" == "T" ] ; then
|
||||||
|
echo "Checking host: $Host on port $PortSSH"
|
||||||
|
else
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
# Use nc to check if the specified port is open
|
# Use nc to check if the specified port is open
|
||||||
if ! nc -z -w ${Timeout} "$Host" "$PortSSH"; then
|
if ! nc -z -w ${Timeout} "$Host" "$PortSSH"; then
|
||||||
|
|||||||
Reference in New Issue
Block a user