develop #2

Merged
Prygoon merged 5 commits from develop into master 2024-08-28 16:23:35 +03:00
Showing only changes of commit 11adb9feca - Show all commits

View File

@ -23,8 +23,13 @@ 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;