Merge remote changes and resolve conflicts

docker-compose.yml

@@ -10,7 +10,6 @@ services:
     volumes:
       - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
-      - webroot:/var/www/html
     depends_on:
       - backend
 
@@ -31,4 +30,3 @@ services:
 
 volumes:
   sqlite_data:
-  webroot:

docker/nginx/conf.d/default.conf

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