Merge remote changes and resolve conflicts

docker-compose.yml

@@ -7,9 +7,12 @@ services:
     restart: unless-stopped
     ports:
       - "80:80"
+      - "443:443"
     volumes:
       - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
+      - certbot-etc:/etc/letsencrypt
+      - certbot-var:/var/lib/letsencrypt
       - webroot:/var/www/html
     depends_on:
       - backend

docker/nginx/conf.d/default.conf

@@ -1,26 +1,25 @@
-server {
+user nginx;
-    listen 80;
+worker_processes auto;
-    listen [::]:80;
-    server_name itformhelp.ru www.itformhelp.ru;
 
-    root /var/www/html;
+error_log /var/log/nginx/error.log notice;
-    index index.html;
+pid /var/run/nginx.pid;
 
-    location ^~ /.well-known/acme-challenge/ {
+events {
-        allow all;
+    worker_connections 1024;
-        default_type "text/plain";
+}
-    }
+
-
+http {
-    location / {
+    include /etc/nginx/mime.types;
-        try_files $uri $uri/ /index.html;
+    default_type application/octet-stream;
-    }
+
-
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
-    location /api/ {
+                   '$status $body_bytes_sent "$http_referer" '
-        proxy_pass http://backend:8000/api/;
+                   '"$http_user_agent" "$http_x_forwarded_for"';
-        proxy_http_version 1.1;
+
-        proxy_set_header Host $host;
+    access_log /var/log/nginx/access.log main;
-        proxy_set_header X-Real-IP $remote_addr;
+
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    sendfile on;
-        proxy_set_header X-Forwarded-Proto $scheme;
+    keepalive_timeout 65;
-    }
+
+    include /etc/nginx/conf.d/*.conf;
 }