Merge remote changes and resolve conflicts

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   frontend:
     build:
@@ -9,7 +7,6 @@ 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
@@ -29,20 +26,9 @@ services:
     volumes:
       - ./backend:/app
       - sqlite_data:/app/instance
-
-  certbot:
-    image: certbot/certbot
-    container_name: certbot
-    volumes:
-      - certbot-etc:/etc/letsencrypt
-      - certbot-var:/var/lib/letsencrypt
-      - webroot:/var/www/html
-    depends_on:
-      - frontend
-    command: certonly --webroot --webroot-path=/var/www/html --email admin@itformhelp.ru --agree-tos --no-eff-email -d itformhelp.ru -d www.itformhelp.ru
+    ports:
+      - "8000:8000"
 
 volumes:
   sqlite_data:
-  certbot-etc:
-  certbot-var:
   webroot:

docker/nginx/conf.d/default.conf

@@ -3,7 +3,6 @@ server {
     listen [::]:80;
     server_name itformhelp.ru www.itformhelp.ru;
     
-    # Для Let's Encrypt
     location /.well-known/acme-challenge/ {
         allow all;
         root /var/www/html;
@@ -13,10 +12,8 @@ server {
         root /usr/share/nginx/html;
         index index.html;
         try_files $uri $uri/ /index.html;
-        expires -1;
-        add_header Cache-Control "no-store, no-cache, must-revalidate";
     }
-    
+
     location /api/ {
         proxy_pass http://backend:8000/api/;
         proxy_http_version 1.1;
@@ -24,8 +21,5 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_connect_timeout 60s;
-        proxy_send_timeout 60s;
-        proxy_read_timeout 60s;
     }
 }