-ssl2

2024-08-12 17:11:18 +03:00 · 2024-08-12 17:11:18 +03:00 · 11adb9feca
commit 11adb9feca
parent 6404556a82
1 changed files with 5 additions and 0 deletions
--- a/nginx.conf
+++ b/nginx.conf
@ -23,8 +23,13 @@ http {
    }

    server {
+<<<<<<< HEAD
        listen 443 ssl;
        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_key /etc/letsencrypt/live/your.domain.example/privkey.pem;