Work_Archive/VPS-scripts_Web-V2
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 11 Wiki Activity

Added failed-ssl fallback

Browse Source
This commit is contained in:
Bram Prieshof
2020-10-08 12:39:19 +02:00
parent 921cf142b8
commit 89456991df
8 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Scripts/EnableSSL.sh
View File

@@ -4,7 +4,6 @@ source /etc/ICTM/mainvar.list
sitename=CONFname
domain=DOMAINname
domainwww=DomainWWW
email=Email
webserv=WebServer
webservice=WebServer
@@ -27,13 +26,23 @@ systemctl reload $webservice
#Enabling SSL
if [ $domainwww = 1 ]; then
/opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$webservice" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
/opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$webserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
certsatus=$?
elif [ $domainwww = 0 ]; then
/opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$webservice" --ocsp --keylength 'ec-384' -d "$domain"
fi
/opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$webserv" --ocsp --keylength 'ec-384' -d "$domain"
certsatus=$?
fi
if test $certsatus -eq 0
then
site_ext="ssl"
else
site_ext="nossl"
fi
unset certsatus
#Restoring config
sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e "/#ConfHere1/ r /tmp/"$sitename"-config" -e '/#ConfHere/c\' /etc/"$webservice"/sites-available/"$sitename"_ssl"$ext"
sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e "/#ConfHere1/ r /tmp/"$sitename"-config" -e '/#ConfHere/c\' /etc/"$webservice"/sites-available/"$sitename"_"$site_ext""$ext"
source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)
#Remove script