From c10678e251185c59d073f240474afaa7161c03a8 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 10 Sep 2023 17:05:03 -0400 Subject: [PATCH] Update TurnKey scripts Disable the 'exit on error' behavior while checking for an IP. --- turnkey/turnkey-core.sh | 2 ++ turnkey/turnkey-fileserver.sh | 2 ++ turnkey/turnkey-gameserver.sh | 2 ++ turnkey/turnkey-gitea.sh | 2 ++ turnkey/turnkey-gitlab.sh | 2 ++ turnkey/turnkey-mediaserver.sh | 2 ++ turnkey/turnkey-nextcloud.sh | 2 ++ turnkey/turnkey-observium.sh | 2 ++ turnkey/turnkey-openvpn.sh | 2 ++ turnkey/turnkey-owncloud.sh | 2 ++ turnkey/turnkey-torrentserver.sh | 2 ++ turnkey/turnkey-wordpress.sh | 2 ++ turnkey/turnkey-zoneminder.sh | 2 ++ 13 files changed, 26 insertions(+) diff --git a/turnkey/turnkey-core.sh b/turnkey/turnkey-core.sh index 49ff3b73c..7a0f8733e 100644 --- a/turnkey/turnkey-core.sh +++ b/turnkey/turnkey-core.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-fileserver.sh b/turnkey/turnkey-fileserver.sh index 379e87851..4826f2533 100644 --- a/turnkey/turnkey-fileserver.sh +++ b/turnkey/turnkey-fileserver.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-gameserver.sh b/turnkey/turnkey-gameserver.sh index 9bf18305c..bc19fd262 100644 --- a/turnkey/turnkey-gameserver.sh +++ b/turnkey/turnkey-gameserver.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-gitea.sh b/turnkey/turnkey-gitea.sh index 2573f471e..3943cde5b 100644 --- a/turnkey/turnkey-gitea.sh +++ b/turnkey/turnkey-gitea.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-gitlab.sh b/turnkey/turnkey-gitlab.sh index b5ec6f5f5..4059f4247 100644 --- a/turnkey/turnkey-gitlab.sh +++ b/turnkey/turnkey-gitlab.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-mediaserver.sh b/turnkey/turnkey-mediaserver.sh index f43e54a17..edd1b6f6b 100644 --- a/turnkey/turnkey-mediaserver.sh +++ b/turnkey/turnkey-mediaserver.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-nextcloud.sh b/turnkey/turnkey-nextcloud.sh index 2147c3c2c..b13cdb5e4 100644 --- a/turnkey/turnkey-nextcloud.sh +++ b/turnkey/turnkey-nextcloud.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-observium.sh b/turnkey/turnkey-observium.sh index d4e5e5de6..93f444b72 100644 --- a/turnkey/turnkey-observium.sh +++ b/turnkey/turnkey-observium.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-openvpn.sh b/turnkey/turnkey-openvpn.sh index 4727d459d..79f5b4072 100644 --- a/turnkey/turnkey-openvpn.sh +++ b/turnkey/turnkey-openvpn.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-owncloud.sh b/turnkey/turnkey-owncloud.sh index 0ae77f2d4..a5f16ff05 100644 --- a/turnkey/turnkey-owncloud.sh +++ b/turnkey/turnkey-owncloud.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-torrentserver.sh b/turnkey/turnkey-torrentserver.sh index 6d15b34c5..795d6c6ff 100644 --- a/turnkey/turnkey-torrentserver.sh +++ b/turnkey/turnkey-torrentserver.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-wordpress.sh b/turnkey/turnkey-wordpress.sh index 3ae34deae..9c7aedc86 100644 --- a/turnkey/turnkey-wordpress.sh +++ b/turnkey/turnkey-wordpress.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service diff --git a/turnkey/turnkey-zoneminder.sh b/turnkey/turnkey-zoneminder.sh index be3197c34..41321872d 100644 --- a/turnkey/turnkey-zoneminder.sh +++ b/turnkey/turnkey-zoneminder.sh @@ -164,6 +164,7 @@ pct start "$CTID" sleep 5 # Get container IP +set +e max_attempts=5 attempt=1 IP="" @@ -183,6 +184,7 @@ if [[ -z $IP ]]; then IP="NOT FOUND" fi +set -e # Start Proxmox VE Monitor-All if available if [[ -f /etc/systemd/system/ping-instances.service ]]; then systemctl start ping-instances.service