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

Fixed ssl oopsie

Browse Source
This commit is contained in:
Bram Prieshof
2020-08-12 12:37:36 +02:00
parent 5f27c5cba1
commit 6e2dc8faf7
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreModules/nginx/config/nginx/site_ssl-unconfigured
View File

@@ -15,7 +15,7 @@ server {
server_name DOMAINname; server_name DOMAINname;
ssl_certificate /etc/letsencrypt/live/DOMAINname/fullchain.pem; ssl_certificate /etc/letsencrypt/live/DOMAINname/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/DOMAINname/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/DOMAINname/privkey.pem;
include ../snippets/ngx-ssl.conf; include snippets/ngx-ssl.conf;

2
CoreModules/nginx/config/nginx/site_ssl-wwwredir
View File

@@ -13,6 +13,6 @@ server {
server_name www.DOMAINname; server_name www.DOMAINname;
ssl_certificate /etc/letsencrypt/live/DOMAINname/fullchain.pem; ssl_certificate /etc/letsencrypt/live/DOMAINname/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/DOMAINname/privkey.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; return 301 https://DOMAINname$request_uri;
} }

2
Scripts/EnableSSL.sh
View File

@@ -26,5 +26,5 @@ fi
#Restoring config #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 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" 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 systemctl reload $webservice