diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 0ed5d1c..1c1c6ac 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -5,7 +5,7 @@ stages: variables: APP_REPO: "https://github.com/barais/doodlestudent.git" - SUBMODULE_PATH: "app" + SUBMODULE_PATH: "doodlestudent" check_app_update: stage: check diff --git a/nginx.conf b/nginx.conf index fab6b70..34a0af7 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,7 +1,9 @@ server { - listen 80; + listen 443 ssl; server_name _; + ssl_certificate /etc/letsencrypt/live/tondomaine.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/tondomaine.com/privkey.pem; root /usr/share/nginx/html; index index.html; @@ -9,7 +11,7 @@ server { # Proxy API requests to the back service ########################## location /api/ { - proxy_pass http://back:8080/; + proxy_pass http://back:8080/api/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -38,4 +40,9 @@ server { proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header Connection ""; } +}, +server { + listen 80; + server_name tondomaine.com; + return 301 https://$host$request_uri; }