Cleaned up the settings a little bit

Author: damalis

install.sh

@@ -244,15 +244,15 @@ if [ -x "$(command -v docker)" ] && [ "$(docker compose version)" ]; then
 				if sudo [ -d "./certbot/live/$domain_name" ]; then break; fi
 			done
 			echo "Ok."
-			until [ ! -z `docker ps -q -f "status=running" --no-trunc | grep $(docker compose ps -q webserver)` ]; do
+			until [ ! -z `docker compose ps -a --filter "status=running" --services | grep webserver` ]; do
 				echo "waiting starting webserver container"
 				sleep 2s & wait ${!}
-				if [ ! -z `docker ps -q -f "status=running" --no-trunc | grep $(docker compose ps -q webserver)` ]; then break; fi
+				if [ ! -z `docker compose ps -a --filter "status=running" --services | grep webserver` ]; then break; fi
 			done			
 			echo ""
 			echo "Reloading webserver ssl configuration"
-			docker container restart webserver > /dev/null 2>&1
-			echo "Ok."
+            docker container restart webserver > /dev/null 2>&1
+            echo "Ok."
 			echo ""
 			echo "completed setup"
 			echo ""

ssl-conf.sh

@@ -42,13 +42,11 @@ wait_for_lets_encrypt() {
 	reload_webserver "$3"
 }
 
-for domain in $1; do
-	if [ ! -d "$2/live/$1" ]; then
-		wait_for_lets_encrypt "$domain" "$2" "$3" &
-	else
-		use_lets_encrypt_certificates "$domain" "$2" "$3"
-		reload_webserver "$3"
-	fi
-done
+if [ ! -d "$2/live/$1" ]; then
+	wait_for_lets_encrypt "$1" "$2" "$3" &
+else
+	use_lets_encrypt_certificates "$1" "$2" "$3"
+	reload_webserver "$3"
+fi
 
 httpd-foreground