Prygoon/nginx-reverse-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Qwerty 2024-08-28 16:20:55 +03:00
parent 11adb9feca
commit 22c40d7c89
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nginx.conf
View File

@ -23,13 +23,8 @@ http {
} }
server { server {
<<<<<<< HEAD
listen 443 ssl; listen 443 ssl;
server_name your.domain.example; server_name your.domain.example;
=======
listen 443;
server_name git.evil-bird.ru;
>>>>>>> cbd9e3c (-ssl2)
ssl_certificate /etc/letsencrypt/live/your.domain.example/fullchain.pem; ssl_certificate /etc/letsencrypt/live/your.domain.example/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/your.domain.example/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/your.domain.example/privkey.pem;