From b6b1a5d0b7e786a5230d10ca6d67157e377645d4 Mon Sep 17 00:00:00 2001 From: Stephane Gourichon Date: Fri, 15 Aug 2025 19:07:49 +0200 Subject: [PATCH] s/monitor_check_once.sh/test_acceptance.sh/ --- .../public/gourichon_org/domain/monitor_check_once.sh | 3 --- .../public/gourichon_org/domain/test_acceptance.sh | 7 +++++++ tools/monitoring__crontask_install.sh | 2 +- tools/monitoring_check_all_once.sh | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100755 service_definitions/public/gourichon_org/domain/monitor_check_once.sh create mode 100755 service_definitions/public/gourichon_org/domain/test_acceptance.sh diff --git a/service_definitions/public/gourichon_org/domain/monitor_check_once.sh b/service_definitions/public/gourichon_org/domain/monitor_check_once.sh deleted file mode 100755 index c19a017..0000000 --- a/service_definitions/public/gourichon_org/domain/monitor_check_once.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -dig gourichon.org diff --git a/service_definitions/public/gourichon_org/domain/test_acceptance.sh b/service_definitions/public/gourichon_org/domain/test_acceptance.sh new file mode 100755 index 0000000..9aa2269 --- /dev/null +++ b/service_definitions/public/gourichon_org/domain/test_acceptance.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +cd -P "$(dirname "$(readlink -f "$0")" )" + +set -eu + +dig gourichon.org | grep -E 'gourichon.org.\s+[0-9]*\s+IN\s+A\s+82.64.72.120' diff --git a/tools/monitoring__crontask_install.sh b/tools/monitoring__crontask_install.sh index a7a13fa..261ca94 100755 --- a/tools/monitoring__crontask_install.sh +++ b/tools/monitoring__crontask_install.sh @@ -43,7 +43,7 @@ then CRON_LINES+=( "0 0 * * * $SCRIPT_ROOT/run_and_output_only_on_error.sh $INFRA_ROOT/$MONITOR_SCRIPT_PATH # monitoring_crontask" ) - done 3< <( find */ -iname "monitor_check_once.sh" ) + done 3< <( find */ -iname "test_acceptance.sh" ) fi { diff --git a/tools/monitoring_check_all_once.sh b/tools/monitoring_check_all_once.sh index 88b39f4..5de450c 100755 --- a/tools/monitoring_check_all_once.sh +++ b/tools/monitoring_check_all_once.sh @@ -16,8 +16,10 @@ function fail_one() while IFS="" read -u 3 -r MONITOR_SCRIPT_PATH do + echo >&2 + echo >&2 "Will run: $MONITOR_SCRIPT_PATH" "$MONITOR_SCRIPT_PATH" || { fail_one "$MONITOR_SCRIPT_PATH" ; } -done 3< <( find . -iname "monitor_check_once.sh" ) +done 3< <( find . -iname "test_acceptance.sh" ) echo "Overall result: $RC" exit "$RC"