From 071984d133002406a981d5215d5ce329510d50eb Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Tue, 29 Aug 2023 15:00:03 -0400
Subject: [PATCH] tweaks

---
 turnkey/turnkey-core.sh       | 8 +++++++-
 turnkey/turnkey-fileserver.sh | 8 +++++++-
 turnkey/turnkey-gitlab.sh     | 8 +++++++-
 turnkey/turnkey-owncloud.sh   | 8 +++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/turnkey/turnkey-core.sh b/turnkey/turnkey-core.sh
index 494af647..d850eabe 100644
--- a/turnkey/turnkey-core.sh
+++ b/turnkey/turnkey-core.sh
@@ -73,7 +73,9 @@ function cleanup_ctid() {
     pct destroy $CTID
   fi
 }
-CTID=$(pvesh get /cluster/nextid)
+if systemctl is-active -q ping-instances.service; then
+  systemctl stop ping-instances.service
+fi
 function select_storage() {
   local CLASS=$1
   local CONTENT
@@ -117,6 +119,7 @@ function select_storage() {
 }
 
 # Test if required variables are set
+CTID=$(pvesh get /cluster/nextid)
 [[ "${CTID:-}" ]] || die "You need to set 'CTID' variable."
 
 # Test if ID is valid
@@ -167,6 +170,9 @@ pct start "$CTID"
 info "LXC container '$CTID' was successfully created."
 echo "TurnKey Core Password" >>~/turnkey-core.creds # file is located in the Proxmox root directory
 echo $PASS >>~/turnkey-core.creds #run `cat turnkey-core.creds` in the Proxmox shell
+if [[ -f /etc/systemd/system/ping-instances.service ]]; then
+  systemctl start ping-instances.service
+fi
 info "Proceed to the LXC console to complete the setup."
 info "login: root"
 info "password: $PASS"
diff --git a/turnkey/turnkey-fileserver.sh b/turnkey/turnkey-fileserver.sh
index 410ef9ec..fea4aa0b 100644
--- a/turnkey/turnkey-fileserver.sh
+++ b/turnkey/turnkey-fileserver.sh
@@ -73,7 +73,9 @@ function cleanup_ctid() {
     pct destroy $CTID
   fi
 }
-CTID=$(pvesh get /cluster/nextid)
+if systemctl is-active -q ping-instances.service; then
+  systemctl stop ping-instances.service
+fi
 function select_storage() {
   local CLASS=$1
   local CONTENT
@@ -117,6 +119,7 @@ function select_storage() {
 }
 
 # Test if required variables are set
+CTID=$(pvesh get /cluster/nextid)
 [[ "${CTID:-}" ]] || die "You need to set 'CTID' variable."
 
 # Test if ID is valid
@@ -167,6 +170,9 @@ pct start "$CTID"
 info "LXC container '$CTID' was successfully created."
 echo "TurnKey File Server Password" >>~/turnkey-fileserver.creds # file is located in the Proxmox root directory
 echo $PASS >>~/turnkey-fileserver.creds #run `cat turnkey-fileserver.creds` in the Proxmox shell
+if [[ -f /etc/systemd/system/ping-instances.service ]]; then
+  systemctl start ping-instances.service
+fi
 info "Proceed to the LXC console to complete the setup."
 info "login: root"
 info "password: $PASS"
diff --git a/turnkey/turnkey-gitlab.sh b/turnkey/turnkey-gitlab.sh
index e1614f9b..ffdd3e58 100644
--- a/turnkey/turnkey-gitlab.sh
+++ b/turnkey/turnkey-gitlab.sh
@@ -73,7 +73,9 @@ function cleanup_ctid() {
     pct destroy $CTID
   fi
 }
-CTID=$(pvesh get /cluster/nextid)
+if systemctl is-active -q ping-instances.service; then
+  systemctl stop ping-instances.service
+fi
 function select_storage() {
   local CLASS=$1
   local CONTENT
@@ -117,6 +119,7 @@ function select_storage() {
 }
 
 # Test if required variables are set
+CTID=$(pvesh get /cluster/nextid)
 [[ "${CTID:-}" ]] || die "You need to set 'CTID' variable."
 
 # Test if ID is valid
@@ -167,6 +170,9 @@ pct start "$CTID"
 info "LXC container '$CTID' was successfully created."
 echo "TurnKey GitLab Password" >>~/turnkey-gitlab.creds # file is located in the Proxmox root directory
 echo $PASS >>~/turnkey-gitlab.creds #run `cat turnkey-gitlab.creds` in the Proxmox shell
+if [[ -f /etc/systemd/system/ping-instances.service ]]; then
+  systemctl start ping-instances.service
+fi
 info "Proceed to the LXC console to complete the setup."
 info "login: root"
 info "password: $PASS"
diff --git a/turnkey/turnkey-owncloud.sh b/turnkey/turnkey-owncloud.sh
index fd3455ff..56ea54f9 100644
--- a/turnkey/turnkey-owncloud.sh
+++ b/turnkey/turnkey-owncloud.sh
@@ -73,7 +73,9 @@ function cleanup_ctid() {
     pct destroy $CTID
   fi
 }
-CTID=$(pvesh get /cluster/nextid)
+if systemctl is-active -q ping-instances.service; then
+  systemctl stop ping-instances.service
+fi
 function select_storage() {
   local CLASS=$1
   local CONTENT
@@ -117,6 +119,7 @@ function select_storage() {
 }
 
 # Test if required variables are set
+CTID=$(pvesh get /cluster/nextid)
 [[ "${CTID:-}" ]] || die "You need to set 'CTID' variable."
 
 # Test if ID is valid
@@ -167,6 +170,9 @@ pct start "$CTID"
 info "LXC container '$CTID' was successfully created."
 echo "TurnKey ownCloud Password" >>~/turnkey-owncloud.creds # file is located in the Proxmox root directory
 echo $PASS >>~/turnkey-owncloud.creds #run `cat turnkey-owncloud.creds` in the Proxmox shell
+if [[ -f /etc/systemd/system/ping-instances.service ]]; then
+  systemctl start ping-instances.service
+fi
 info "Proceed to the LXC console to complete the setup."
 info "login: root"
 info "password: $PASS"