diff --git a/default.conf b/default.conf index 7079c9d..745a80d 100644 --- a/default.conf +++ b/default.conf @@ -2,7 +2,7 @@ server { root /usr/share/nginx/html; index index.html index.htm index.nginx-debian.html; - server_name _; # managed by Certbot + server_name quiz.pena.digital; # managed by Certbot client_max_body_size 70M; location /404 { @@ -10,12 +10,36 @@ server { } location / { - if ($host = quiz.pena.digital) { - proxy_pass http://squiz; - } + proxy_pass http://squiz; + } + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/nginx/certs/live/pena.digital/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/nginx/certs/live/pena.digital/privkey.pem; # managed by Certbot + +} +server { + root /usr/share/nginx/html; + + index index.html index.htm index.nginx-debian.html; + server_name pena.digital; # managed by Certbot + client_max_body_size 70M; + + location /404 { + try_files $uri $uri/ /index.html; + } + + location /feedback/ { + add_header Access-Control-Allow-Origin pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type always; + proxy_set_header Host $host; + proxy_pass http://10.8.0.8:8006/; + } + location / { + proxy_pass http://services; } - listen [::]:443 ssl ipv6only=on; # managed by Certbot listen 443 ssl; # managed by Certbot ssl_certificate /etc/nginx/certs/live/pena.digital/fullchain.pem; # managed by Certbot ssl_certificate_key /etc/nginx/certs/live/pena.digital/privkey.pem; # managed by Certbot diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml index 2c02f58..7bd224e 100644 --- a/deployments/main/docker-compose.yaml +++ b/deployments/main/docker-compose.yaml @@ -2,8 +2,8 @@ services: router: image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID ports: - - 80:80 - - 443:443 + - 10.6.0.28:80:80 + - 10.6.0.28:443:443 restart: always volumes: - ./nginx/certs/:/etc/nginx/certs/:ro