diff --git a/docker-compose.yml b/docker-compose.yml index 9d9b51a..856fae5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -85,8 +85,8 @@ services: nginx: image: nginx:alpine ports: - - "80:80" - - "443:443" + - "8081:80" + - "8444:443" volumes: - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro - ./nginx/ssl:/etc/nginx/ssl:ro diff --git a/nginx/nginx.conf b/nginx/nginx.conf index d6ef0e0..d7a035c 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -1,19 +1,36 @@ -server { - listen 80; - server_name localhost; - root /usr/share/nginx/html; - index index.html; +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; - location / { - try_files $uri $uri/ /index.html; - } + # Use Docker's internal DNS so upstream IPs are re-resolved after restarts + resolver 127.0.0.11 valid=10s; + resolver_timeout 5s; - location /api/ { - proxy_pass http://backend:8000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; + server { + listen 80; + server_name _; + + location /api/ { + set $backend_upstream http://backend:8000; + proxy_pass $backend_upstream; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_cache_bypass $http_upgrade; + } + + location / { + set $frontend_upstream http://frontend:80; + proxy_pass $frontend_upstream; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + } } } + +events { + worker_connections 1024; +} diff --git a/scripts/seed_family.py b/scripts/seed_family.py index f7249ce..a5c8824 100644 --- a/scripts/seed_family.py +++ b/scripts/seed_family.py @@ -21,7 +21,7 @@ CHILD_COUNT = 2 MEMBERS = [ {"name": "Peter", "email": "peter@research.bike", "role": "adult", "likes_mushrooms": True}, - {"name": "Wife", "email": "wife@example.com", "role": "adult", "likes_mushrooms": False}, + {"name": "Julia", "email": "julia@research.bike", "role": "adult", "likes_mushrooms": False}, {"name": "Kid 1", "email": "", "role": "child", "likes_mushrooms": False}, {"name": "Kid 2", "email": "", "role": "child", "likes_mushrooms": False}, ]