diff --git a/Scripts/EnableSSL.sh b/Scripts/EnableSSL.sh index dd27b3a..8f7b2cf 100644 --- a/Scripts/EnableSSL.sh +++ b/Scripts/EnableSSL.sh @@ -1,7 +1,7 @@ #loading install vars source /etc/ICTM/mainvar.list #Setting Vars -confname=CONFname +sitename=CONFname domain=DOMAINname domainwww=DomainWWW email=Email @@ -15,8 +15,8 @@ if [ $webservice = apache ]; then fi #Backing-up and removing current config -sed -n '/#beginConf/,/#endConf/p' /etc/"$webservice"/sites-available/"$confname"_nossl"$ext" > /tmp/"$confname"-config -sed -n -i '/#beginConf/{:a;N;/#endConf/!ba;N;s/.*\n/#ConfHere\n/};p' /etc/"$webservice"/sites-available/"$confname"_nossl"$ext" +sed -n '/#beginConf/,/#endConf/p' /etc/"$webservice"/sites-available/"$sitename"_nossl"$ext" > /tmp/"$sitename"-config +sed -n -i '/#beginConf/{:a;N;/#endConf/!ba;N;s/.*\n/#ConfHere\n/};p' /etc/"$webservice"/sites-available/"$sitename"_nossl"$ext" systemctl reload $webservice #Enabling SSL @@ -27,5 +27,5 @@ elif [ $domainwww = 0 ]; then fi #Restoring config -sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e "/#ConfHere1/ r /tmp/"$confname"-config" -e '/#ConfHere/c\' /etc/"$webservice"/sites-available/"$confname"_ssl"$ext" +sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e "/#ConfHere1/ r /tmp/"$sitename"-config" -e '/#ConfHere/c\' /etc/"$webservice"/sites-available/"$sitename"_ssl"$ext" source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)