From cf0a34c045c5b7bc531be4f03099303007f8e895 Mon Sep 17 00:00:00 2001 From: no Date: Thu, 28 Nov 2024 13:57:54 +0100 Subject: [PATCH] finetuning --- README.md | 1 + config.conf | 1 + functions/restart_service.sh | 7 ++++++- functions/sql_check.sh | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 07ed72d..16bf110 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ Die Einstellungen werden in der Datei `config.conf` vorgenommen. Nachfolgend ein | `SSH_KEY` | Pfad zur SSH-Schlüsseldatei | `/path/to/private_key`| | `SSH_USER` | Benutzername für SSH | `user` | | `SSH_HOST` | Hostname oder IP der SSH-Verbindung | `remote_host` | +| `SERVICE_NAME` | VPN-Dienst automatisch neu starten | `false` | | `SERVICE_NAME` | Name des zu überprüfenden Dienstes | `ipsec.service` | --- diff --git a/config.conf b/config.conf index d597c48..6ddf0bf 100644 --- a/config.conf +++ b/config.conf @@ -23,4 +23,5 @@ SSH_USER="user" SSH_HOST="remote_host" # Dienstname für Neustart +AUTO_RESTART_SERVICE=false # true zum Aktivieren, false zum Deaktivieren SERVICE_NAME="ipsec.service" diff --git a/functions/restart_service.sh b/functions/restart_service.sh index 1eae40f..4b37cef 100644 --- a/functions/restart_service.sh +++ b/functions/restart_service.sh @@ -1,6 +1,11 @@ #!/bin/bash function restart_service() { + if [[ "$AUTO_RESTART_SERVICE" != "true" ]]; then + log_info "Automatic service restart is disabled. Skipping restart." + return 0 + fi + log_info "Attempting to restart service $SERVICE_NAME on $SSH_HOST." ssh -i $SSH_KEY $SSH_USER@$SSH_HOST "sudo systemctl restart $SERVICE_NAME" @@ -9,7 +14,7 @@ function restart_service() { exit 2 fi - ssh -i $SSH_KEY $SSH_USER@$SSH_HOST "sudo ipsec statusall | grep -i 'running'" + ssh -i $SSH_KEY $SSH_USER@$SSH_HOST "sudo ipsec statusall | grep -i '1 up, 0 connecting'" if [ $? -ne 0 ]; then log_critical "Service $SERVICE_NAME not running after restart." exit 2 diff --git a/functions/sql_check.sh b/functions/sql_check.sh index 6bd2646..c646813 100644 --- a/functions/sql_check.sh +++ b/functions/sql_check.sh @@ -2,10 +2,10 @@ function check_sql_activity() { last_order_time=$(mysql -u $DB_USER -p$DB_PASSWORD -D $DB_NAME -sse \ - "SELECT MAX(create_time) FROM otrs_ticket WHERE create_user = 'LIDLWebservice';") + "SELECT MAX(create_time) FROM ticket WHERE customer_user_id = 'LIDLWebservice';") last_bsi_log_time=$(mysql -u $DB_USER -p$DB_PASSWORD -D $DB_NAME -sse \ - "SELECT MAX(log_time) FROM bsi_logs WHERE service = 'ITNovumBSIConnector';") + "SELECT MAX(create_time) FROM gi_debugger_entry WHERE webservice_id = 13;") if [[ -z "$last_order_time" || -z "$last_bsi_log_time" ]]; then log_error "SQL query failed or returned no data."