Simplifying Nginx structure, adding IPv6.

Author: smangham

README.md

@@ -27,7 +27,7 @@ Start the server (and associated containers) using:
 
 ```bash
 screen
-sudo docker compose up
+sudo docker compose up web
 ```
 
 ### Initialising
@@ -53,7 +53,7 @@ To update the tool, take the containers down, rebuild, and restart using:
 screen -r
 sudo docker compose down 
 sudo docker compose build --no-cache
-sudo docker compose up
+sudo docker compose up web
 ```
 
 # Extra

docker-compose.yml

@@ -1,13 +1,15 @@
 services:
+  # This is only required if you're running it stand-alone; on the deployment it shares a VM,
+  # so the nginx file has to be used by the actual VM-level Nginx.
   nginx:
     container_name: physics-workload-nginx
     image: nginx:latest
     ports:
-      - "8000:80"
-      - "8443:443"
+      - "80:80"
+      - "443:443"
     volumes:
       - type: bind
-        source: "${PROJECT_PATH}/nginx/app.conf"
+        source: "${PROJECT_PATH}/nginx/physics_workload.conf"
         target: "/etc/nginx/conf.d/default.conf"
       - type: bind
         source: "${PROJECT_PATH}/logs/"
@@ -31,8 +33,8 @@ services:
     build:
       dockerfile: Dockerfile
       context: .
-    expose:
-      - "8000"
+    ports:
+      - "8000:8000"
     env_file:
       - "./.env.default"
       - "./.env"

nginx/app.conf nginx/physics_workload.confnginx/app.conf renamed to nginx/physics_workload.conf

@@ -12,7 +12,8 @@ server {
     }
 
     location / {
-        proxy_pass http://physics_workload_django:8000;
+        # proxy_pass http://web:8000;  # For if you're serving it standalone through nginx on docker-compose.
+        proxy_pass http://localhost:8000;
         proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
         proxy_redirect off;
         proxy_buffering off;
@@ -23,6 +24,7 @@ server {
     }
 
     listen 443 ssl;
+    listen [::]:443 ssl;
 
     ssl_certificate /etc/tls/certs/teaching.physics.soton.ac.uk.pem;
     ssl_certificate_key /etc/tls/private/teaching.physics.soton.ac.uk.key;
@@ -31,6 +33,8 @@ server {
 # Redirect non-HTTPS traffic to HTTPS
 server {
     listen 80;
+    listen [::]:80;
+
     server_name teaching.physics.soton.ac.uk;
     return 301 https://$host:$request_uri;
 }