From 6e2dc8faf79d82c051f941634cd3cd100e87f0a5 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Wed, 12 Aug 2020 12:37:36 +0200 Subject: [PATCH] Fixed ssl oopsie --- CoreModules/nginx/config/nginx/site_ssl-unconfigured | 2 +- CoreModules/nginx/config/nginx/site_ssl-wwwredir | 2 +- Scripts/EnableSSL.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CoreModules/nginx/config/nginx/site_ssl-unconfigured b/CoreModules/nginx/config/nginx/site_ssl-unconfigured index 4178ca9..735d27c 100644 --- a/CoreModules/nginx/config/nginx/site_ssl-unconfigured +++ b/CoreModules/nginx/config/nginx/site_ssl-unconfigured @@ -15,7 +15,7 @@ server { server_name DOMAINname; ssl_certificate /etc/letsencrypt/live/DOMAINname/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/DOMAINname/privkey.pem; - include ../snippets/ngx-ssl.conf; + include snippets/ngx-ssl.conf; diff --git a/CoreModules/nginx/config/nginx/site_ssl-wwwredir b/CoreModules/nginx/config/nginx/site_ssl-wwwredir index 841cd48..eb2373b 100644 --- a/CoreModules/nginx/config/nginx/site_ssl-wwwredir +++ b/CoreModules/nginx/config/nginx/site_ssl-wwwredir @@ -13,6 +13,6 @@ server { server_name www.DOMAINname; ssl_certificate /etc/letsencrypt/live/DOMAINname/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/DOMAINname/privkey.pem; - include ../snippets/ngx-ssl.conf; + include snippets/ngx-ssl.conf; return 301 https://DOMAINname$request_uri; } diff --git a/Scripts/EnableSSL.sh b/Scripts/EnableSSL.sh index 2c4f0ed..75ec5fa 100644 --- a/Scripts/EnableSSL.sh +++ b/Scripts/EnableSSL.sh @@ -26,5 +26,5 @@ 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 rm /etc/"$webservice"/sites-enabled/"$confname" -ln -s /etc/"$webservice"/sites-available/"$sitename"_ssl /etc/nginx/sites-enabled/"$sitename" +ln -s /etc/"$webservice"/sites-available/"$confname"_ssl /etc/"$webservice"/sites-enabled/"$confname" systemctl reload $webservice \ No newline at end of file