From 7618b71cb4d0e5e7afaaf95644ce19a929a3f7bd Mon Sep 17 00:00:00 2001
From: Johan <johan.followit@gmail.com>
Date: Tue, 7 Mar 2023 14:44:58 +0100
Subject: [PATCH] Update apache-add-site.sh

---
 BashScripts/install-apache/apache-add-site.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/BashScripts/install-apache/apache-add-site.sh b/BashScripts/install-apache/apache-add-site.sh
index e77fcca..77143bf 100644
--- a/BashScripts/install-apache/apache-add-site.sh
+++ b/BashScripts/install-apache/apache-add-site.sh
@@ -8,6 +8,7 @@ if [[ $1 = "" ]]; then
 	exit 0
 fi
 domain=$(perl -e "(\$d)=\"$1\"=~/(\\w+\\.\\w+)\$/;print \$d")
+host=$(perl -e "(\$d)=\"$1\"=~/(\\w+)\\.\\w+\\.\\w+\$/;print \$d")
 red='\033[0;31m'
 green='\033[0;32m'
 nocolor='\033[0m'
@@ -26,21 +27,29 @@ if [[ -f "/etc/apache2/sites-enabled/$1.conf" ]]; then
 fi
 chmod -R 777 "/var/www/$1"
 
-declare -a CertDirectories=("/var/www/$domain/certs" "/var/www/SSL-Cerfificates")
+echo "Searching for SSL certificate for $domain ..."
+declare -a CertDirectories=("/var/www/$domain/certs" "/var/www/SSL-Certificates")
 unset CertDirectory
 for TestDirectory in "${CertDirectories[@]}"
 do
 	if [[ -f "$TestDirectory/$domain-crt.pem" ]] && [[ -f "$TestDirectory/$domain-key.pem" ]] && [[ -f "$TestDirectory/$domain-chain.pem" ]]; then
+		echo "SSL certificate found!"
 		CertDirectory=$TestDirectory;
 	fi
 done
 
+if [[ $host = "" ]]; then
+	serveralias="ServerAlias www.$1"
+else
+	serveralias=""
+fi
+
 echo Adding site
 cat <<EOT1 >> "/etc/apache2/sites-enabled/$1.conf"
 <VirtualHost *:80>
 
 	ServerName $1
-	ServerAlias www.$1
+	$serveralias
 	ServerAdmin webmaster@$1
 	DocumentRoot /var/www/$1/www
 
@@ -69,7 +78,7 @@ if [[ ! $CertDirectory = "" ]]; then
 	<VirtualHost *:443>
 
 		ServerName $1
-		ServerAlias www.$1
+		$serveralias
 		ServerAdmin webmaster@$1
 		DocumentRoot /var/www/$1/www