From 2e217b095b52655a813d4fc47faac747dcf4e61a Mon Sep 17 00:00:00 2001
From: Bram Prieshof <brammp@noreply.bprieshof.nl>
Date: Wed, 26 Aug 2020 11:53:15 +0000
Subject: [PATCH] Update 'Scripts/EnableSSL.sh'

---
 Scripts/EnableSSL.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Scripts/EnableSSL.sh b/Scripts/EnableSSL.sh
index 8c2d264..dd27b3a 100644
--- a/Scripts/EnableSSL.sh
+++ b/Scripts/EnableSSL.sh
@@ -11,13 +11,12 @@ webservice=WebServer
 #Correcting service name for Apache
 if [ $webservice = apache ]; then
     webservice=apache2
-    pre=010-
     ext=.conf
 fi
 
 #Backing-up and removing current config
-sed -n '/#beginConf/,/#endConf/p' /etc/"$webservice"/sites-available/"$pre""$confname"_nossl"$ext" > /tmp/"$confname"-config
-sed -n -i '/#beginConf/{:a;N;/#endConf/!ba;N;s/.*\n/#ConfHere\n/};p' /etc/"$webservice"/sites-available/"$pre""$confname"_nossl"$ext"
+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"
 systemctl reload $webservice
 
 #Enabling SSL
@@ -28,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/"$pre""$confname"_ssl"$ext"
+sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e "/#ConfHere1/ r /tmp/"$confname"-config" -e '/#ConfHere/c\' /etc/"$webservice"/sites-available/"$confname"_ssl"$ext"
 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)