Merge remote changes and resolve conflicts

docker-compose.yml

@@ -7,8 +7,13 @@ 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
 
@@ -25,5 +30,19 @@ services:
       - ./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
+
 volumes:
   sqlite_data:
+  certbot-etc:
+  certbot-var:
+  webroot:

docker/nginx/conf.d/default.conf

@@ -1,19 +1,42 @@
+# Redirect HTTP to HTTPS
 server {
     listen 80;
     listen [::]:80;
     server_name itformhelp.ru www.itformhelp.ru;
     
+    # Allow certbot auth challenge
+    location /.well-known/acme-challenge/ {
+        root /var/www/html;
+    }
+
+    # Redirect all other traffic to HTTPS
+    location / {
+        return 301 https://$host$request_uri;
+    }
+}
+
+# HTTPS server
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+    server_name itformhelp.ru www.itformhelp.ru;
+
+    # SSL configuration
+    ssl_certificate /etc/letsencrypt/live/itformhelp.ru/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/itformhelp.ru/privkey.pem;
+    
     root /usr/share/nginx/html;
     index index.html;
 
+    # Frontend
     location / {
         try_files $uri $uri/ /index.html;
-        expires -1;
         add_header Cache-Control "no-store, no-cache, must-revalidate";
     }
 
+    # Backend API
     location /api/ {
-        proxy_pass http://backend:8000/api/;
+        proxy_pass http://backend:8000;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;