Cleaned up the settings a little bit

Author: damalis

install.sh

@@ -30,7 +30,7 @@ sudo apt-get update
 Installed=`sudo apt-cache policy docker-ce | sed -n '2p' | cut -c 14-`
 Candidate=`sudo apt-cache policy docker-ce | sed -n '3p' | cut -c 14-`
 
-if [[ "$Installed" != "$Candidate" ]]; then 
+if [[ "$Installed" != "$Candidate" ]]; then
 	sudo apt-get install docker-ce docker-ce-cli containerd.io
 elif [[ "$Installed" == "$Candidate" ]]; then
 	echo ""
@@ -244,11 +244,11 @@ 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
-				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
-			done			
+			#until [ ! -z `docker compose ps -a --filter "status=running" --services | grep webserver` ]; do
+			#	echo "waiting starting webserver container"
+			#	sleep 2s & wait ${!}
+			#	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

ssl-conf.sh

@@ -14,7 +14,7 @@ use_lets_encrypt_certificates() {
 	echo "switching webserver to use Let's Encrypt certificate for $1"
 	sed 's/#LoadModule/LoadModule/' $3/extra/httpd-vhosts.conf > $3/extra/httpd-vhosts.conf.bak
 	sed 's/example.com/'$1'/g' $3/extra/httpd-ssl.conf > $3/extra/httpd-ssl.conf.bak
-	sed '/^#\(.*\)httpd-ssl\.conf/ s/^#//' $3/httpd.conf > $3/httpd.conf.bak	
+	sed '/^#\(.*\)httpd-ssl\.conf/ s/^#//' $3/httpd.conf > $3/httpd.conf.bak
 }
 
 reload_webserver() {
@@ -23,7 +23,7 @@ reload_webserver() {
 	cp $1/httpd.conf.bak $1/httpd.conf
 	rm $1/extra/httpd-ssl.conf.bak
 	rm $1/extra/httpd-vhosts.conf.bak
-	rm $1/httpd.conf.bak	
+	rm $1/httpd.conf.bak
 	echo "Starting webserver apache2 service"
 	httpd -t
 }
@@ -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