diff --git a/docker-compose.yml b/docker-compose.yml index ee017e2..abc942e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,8 +22,11 @@ services: ref_test_app: container_name: ref_test_app build: ./ref-test +<<<<<<< HEAD volumes: - ./ref-test:/ref-test +======= +>>>>>>> 9462d7aa7f14b379766503503fd3ba08e1469574 env_file: - ./.env ports: @@ -41,7 +44,11 @@ services: image: mongo:5.0.4-focal restart: unless-stopped volumes: +<<<<<<< HEAD - ./database/data:/data +======= + - ./database/data:/data/db +>>>>>>> 9462d7aa7f14b379766503503fd3ba08e1469574 - ./database/initdb.d/:/docker-entrypoint-initdb.d/ env_file: - ./.env @@ -69,7 +76,11 @@ services: - ./src/html:/var/www/html depends_on: - ref_test_server +<<<<<<< HEAD # command: certonly --webroot --webroot-path=/var/www/html --email vsdomainmanager@gmail.com --agree-tos --no-eff-email -d reftest.vsnt.uk +======= + # command: certonly --webroot --webroot-path=/var/www/html --email (email) --agree-tos --no-eff-email -d (domain) +>>>>>>> 9462d7aa7f14b379766503503fd3ba08e1469574 networks: frontend: diff --git a/nginx/conf.d/ref-test-app.conf b/nginx/conf.d/ref-test-app.conf new file mode 100644 index 0000000..225fe42 --- /dev/null +++ b/nginx/conf.d/ref-test-app.conf @@ -0,0 +1,36 @@ +upstream reftest { + server ref_test_app:5000; +} + +server { + server_name domain_name; + listen 80; + listen [::]:80; + # Redirect to ssl + return 301 https://$host$request_uri; +} + +server { + server_name domain_name; + listen 443 ssl http2; + listen [::]:443 ssl http2; + + #SSL configuration + include /etc/nginx/ssl.conf; + include /etc/nginx/certbot-challenge.conf; + + location ^~ /static/ { + include /etc/nginx/mime.types; + alias /usr/share/nginx/html/quiz/static/; + } + + location ^~ /admin/static/ { + include /etc/nginx/mime.types; + alias /usr/share/nginx/html/admin/static/; + } + + location / { + include /etc/nginx/conf.d/common-location.conf; + proxy_pass http://reftest; + } +} \ No newline at end of file diff --git a/nginx/ssl.conf b/nginx/ssl.conf new file mode 100644 index 0000000..04afb12 --- /dev/null +++ b/nginx/ssl.conf @@ -0,0 +1,2 @@ +ssl_certificate /etc/letsencrypt/live/domain_name/fullchain.pem; # managed by Certbot +ssl_certificate_key /etc/letsencrypt/live/domain_name/privkey.pem; # managed by Certbot \ No newline at end of file