Merge remote changes and resolve conflicts

docker-compose.yml

@@ -29,6 +29,8 @@ services:
     volumes:
       - ./backend:/app
       - sqlite_data:/app/instance
+    ports:
+      - "8000:8000"
 
   certbot:
     image: certbot/certbot
@@ -37,9 +39,8 @@ services:
       - 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
+    command: certonly --webroot --webroot-path=/var/www/html --email admin@itformhelp.ru --agree-tos --no-eff-email --force-renewal --staging -d itformhelp.ru -d www.itformhelp.ru
+
 volumes:
   sqlite_data:
   certbot-etc:

docker/nginx/conf.d/default.conf

@@ -3,17 +3,16 @@ server {
     listen [::]:80;
     server_name itformhelp.ru www.itformhelp.ru;
     
+    root /usr/share/nginx/html;
+    index index.html;
+
     location ~ /.well-known/acme-challenge {
         allow all;
         root /var/www/html;
     }
 
     location / {
-        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/ {
@@ -23,8 +22,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;
     }
 }