From eb82f0a86b62e2db1a8d3c05f0fc1c05c607a45a Mon Sep 17 00:00:00 2001
From: gyurix <gyorgy.berenyi@format.hu>
Date: Fri, 3 Sep 2021 06:50:34 +0000
Subject: [PATCH] Minor bugfixes.

---
 scripts/check_certificates.sh |  6 ++++--
 scripts/check_proxy_state.sh  | 20 ++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/scripts/check_certificates.sh b/scripts/check_certificates.sh
index 418be99..9baf5d6 100755
--- a/scripts/check_certificates.sh
+++ b/scripts/check_certificates.sh
@@ -15,10 +15,12 @@ service_exec="docker run --rm \
 
 letsencrypt_certificates() {
 
-	echo "XYZ: "$PROXY_SERVICE_FILE" "$ROLE
+	local RUNNING_CONTAINERS;
+
+	cd /
 
 	# Check services with running containers by roles
-	for CONTAINER in $(jq -r --arg ROLE $ROLE '.containers[] | select(.ROLES==$ROLE)' $PROXY_SERVICE_FILE | jq -r .NAME) ; do
+	for CONTAINER in $(jq -r --arg ROLE $ROLE '.containers[] | select(.ROLES==$ROLE)' /$PROXY_SERVICE_FILE | jq -r .NAME) ; do
 		UP=$(docker ps | grep $CONTAINER | grep Up | wc -l)
 		RUNNING_CONTAINERS=$((RUNNING_CONTAINERS + UP))
 	done;
diff --git a/scripts/check_proxy_state.sh b/scripts/check_proxy_state.sh
index 9da8063..9fe2906 100755
--- a/scripts/check_proxy_state.sh
+++ b/scripts/check_proxy_state.sh
@@ -30,7 +30,7 @@ do_proxy_restart() {
 			for retries in $(seq 0 $((RESTART + 1))); do
 				if [[ $retries -le $RESTART ]] ; then
 					echo "Proxy "$PROXY_NAME" restarting in progress";
-					docker stop $proxies;
+					docker stop $PROXY_NAME;
 					sleep $TIMEOUT;
 					$service_exec $SERVICE_NAME.containers.$PROXY_NAME start
 						if docker ps | grep $PROXY_NAME ; then
@@ -95,23 +95,27 @@ if [[ "$RUNNING_CONTAINERS" == "$CONTAINERS_BY_ROLE" || "$RUNNING_CONTAINERS" -g
 elif [[ "$RUNNING_CONTAINERS" -eq 0 ]] ; then 
 	echo "No running proxies found, starting all";
 	
+	$service_exec /services/$SERVICE_NAME.json stop;
 	$service_exec /services/$SERVICE_NAME.json start;
 	
 	for proxies in $CONTAINERS ; do 
 
-	if docker ps | grep $proxies ; then
-		echo "$proxies started successful";
-	else 
-		echo "$proxies starting was unsuccesful"
-	fi
-	done	
+		if docker ps | grep $proxies ; then
+			echo "$proxies started successful";
+		else 
+			echo "$proxies starting was unsuccesful"
+		fi
+	done
+
 # In case of only one running proxy found, try to start the others of the service
 elif [[ "$RUNNING_CONTAINERS" -eq 1 ]] ; then 
 	echo "Only one running proxy found, starting all of the others";
 	for proxies in $CONTAINERS ; do
 		if [[ $proxies != $CONTAINER_NAMES ]] ; then
 			echo "No running containers: "$proxies" found.";
-			$service_exec $SERVICE_NAME.containers.$proxies start;
+			
+			do_proxy_restart $proxies;
+			
 			if docker ps | grep $proxies ; then
 				echo "$proxies started successful";
 			else