Update apache-add-site.sh
This commit is contained in:
parent
e6920b69bd
commit
7618b71cb4
@ -8,6 +8,7 @@ if [[ $1 = "" ]]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
domain=$(perl -e "(\$d)=\"$1\"=~/(\\w+\\.\\w+)\$/;print \$d")
|
domain=$(perl -e "(\$d)=\"$1\"=~/(\\w+\\.\\w+)\$/;print \$d")
|
||||||
|
host=$(perl -e "(\$d)=\"$1\"=~/(\\w+)\\.\\w+\\.\\w+\$/;print \$d")
|
||||||
red='\033[0;31m'
|
red='\033[0;31m'
|
||||||
green='\033[0;32m'
|
green='\033[0;32m'
|
||||||
nocolor='\033[0m'
|
nocolor='\033[0m'
|
||||||
@ -26,21 +27,29 @@ if [[ -f "/etc/apache2/sites-enabled/$1.conf" ]]; then
|
|||||||
fi
|
fi
|
||||||
chmod -R 777 "/var/www/$1"
|
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
|
unset CertDirectory
|
||||||
for TestDirectory in "${CertDirectories[@]}"
|
for TestDirectory in "${CertDirectories[@]}"
|
||||||
do
|
do
|
||||||
if [[ -f "$TestDirectory/$domain-crt.pem" ]] && [[ -f "$TestDirectory/$domain-key.pem" ]] && [[ -f "$TestDirectory/$domain-chain.pem" ]]; then
|
if [[ -f "$TestDirectory/$domain-crt.pem" ]] && [[ -f "$TestDirectory/$domain-key.pem" ]] && [[ -f "$TestDirectory/$domain-chain.pem" ]]; then
|
||||||
|
echo "SSL certificate found!"
|
||||||
CertDirectory=$TestDirectory;
|
CertDirectory=$TestDirectory;
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [[ $host = "" ]]; then
|
||||||
|
serveralias="ServerAlias www.$1"
|
||||||
|
else
|
||||||
|
serveralias=""
|
||||||
|
fi
|
||||||
|
|
||||||
echo Adding site
|
echo Adding site
|
||||||
cat <<EOT1 >> "/etc/apache2/sites-enabled/$1.conf"
|
cat <<EOT1 >> "/etc/apache2/sites-enabled/$1.conf"
|
||||||
<VirtualHost *:80>
|
<VirtualHost *:80>
|
||||||
|
|
||||||
ServerName $1
|
ServerName $1
|
||||||
ServerAlias www.$1
|
$serveralias
|
||||||
ServerAdmin webmaster@$1
|
ServerAdmin webmaster@$1
|
||||||
DocumentRoot /var/www/$1/www
|
DocumentRoot /var/www/$1/www
|
||||||
|
|
||||||
@ -69,7 +78,7 @@ if [[ ! $CertDirectory = "" ]]; then
|
|||||||
<VirtualHost *:443>
|
<VirtualHost *:443>
|
||||||
|
|
||||||
ServerName $1
|
ServerName $1
|
||||||
ServerAlias www.$1
|
$serveralias
|
||||||
ServerAdmin webmaster@$1
|
ServerAdmin webmaster@$1
|
||||||
DocumentRoot /var/www/$1/www
|
DocumentRoot /var/www/$1/www
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user