Skip to content
Extraits de code Groupes Projets
Valider 68caf9a9 rédigé par Brieuc Dubois's avatar Brieuc Dubois
Parcourir les fichiers

Merge branch 'main' into dev

parents a76efb05 abbb02b5
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!29Dev
tls:
certificates:
- certFile: /etc/traefik/languagelab_sipr_ucl_ac_be.pem
keyFile: /etc/traefik/languagelab_sipr_ucl_ac_be.key
- certFile: /etc/traefik/languagelab_be.pem
keyFile: /etc/traefik/languagelab_be.key
......@@ -11,8 +11,8 @@ services:
- external
labels:
- "traefik.enable=true"
#- "traefik.http.routers.frontend.rule=Host(`languagelab.be`)"
- "traefik.http.routers.frontend.rule=Host(`languagelab.sipr.ucl.ac.be`)"
- "traefik.http.routers.frontend.rule=Host(`languagelab.be`)"
#- "traefik.http.routers.frontend.rule=Host(`languagelab.sipr.ucl.ac.be`)"
- "traefik.http.routers.frontend.tls=true"
- "traefik.http.services.frontend.loadbalancer.server.port=8080"
......@@ -37,8 +37,8 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.backend.tls=true"
- "traefik.http.services.backend.loadbalancer.server.port=8000"
#- "traefik.http.routers.backend.rule=Host(`languagelab.be`) && (PathPrefix(`/tmp-api`) || PathPrefix(`/docs`) || PathPrefix(`/openapi.json`))"
- "traefik.http.routers.backend.rule=Host(`languagelab.sipr.ucl.ac.be`) && (PathPrefix(`/tmp-api`) || PathPrefix(`/docs`) || PathPrefix(`/openapi.json`))"
- "traefik.http.routers.backend.rule=Host(`languagelab.be`) && (PathPrefix(`/tmp-api`) || PathPrefix(`/docs`) || PathPrefix(`/openapi.json`))"
#- "traefik.http.routers.backend.rule=Host(`languagelab.sipr.ucl.ac.be`) && (PathPrefix(`/tmp-api`) || PathPrefix(`/docs`) || PathPrefix(`/openapi.json`))"
traefik:
container_name: traefik
......@@ -66,11 +66,11 @@ services:
source: /mnt/data/languagelab/repo/configs/traefik.yaml
target: /etc/traefik/dynamic-config.yaml
- type: bind
source: /mnt/data/languagelab/repo/configs/languagelab_sipr_ucl_ac_be.key
target: /etc/traefik/languagelab_sipr_ucl_ac_be.key
source: /mnt/data/languagelab/repo/configs/languagelab_be.key
target: /etc/traefik/languagelab_be.key
- type: bind
source: /mnt/data/languagelab/repo/configs/languagelab_sipr_ucl_ac_be.pem
target: /etc/traefik/languagelab_sipr_ucl_ac_be.pem
source: /mnt/data/languagelab/repo/configs/languagelab_be.pem
target: /etc/traefik/languagelab_be.pem
restart: always
networks:
- external
......
export default {
API_URL: import.meta.env.VITE_API_URL || 'https://languagelab.sipr.ucl.ac.be/tmp-api',
API_PROXY: import.meta.env.VITE_API_PROXY || 'https://languagelab.sipr.ucl.ac.be/tmp-api',
API_URL: import.meta.env.VITE_API_URL || 'https://languagelab.be/tmp-api',
API_PROXY: import.meta.env.VITE_API_PROXY || 'https://languagelab.be/tmp-api',
APP_URL: import.meta.env.VITE_APP_URL || 'https://languagelab.be',
WS_URL: import.meta.env.VITE_WS_URL || 'wss://languagelab.sipr.ucl.ac.be/tmp-api/v1/ws',
//API_URL: import.meta.env.VITE_API_URL || 'https://languagelab.be/tmp-api',
//API_PROXY: import.meta.env.VITE_API_PROXY || 'https://languagelab.be/tmp-api',
//WS_URL: import.meta.env.VITE_WS_URL || 'wss://languagelab.be/tmp-api/v1/ws',
//
//API_URL: import.meta.env.VITE_API_URL || 'https://api.languagelab.be/api',
//API_PROXY: import.meta.env.VITE_API_PROXY || 'https://api.languagelab.be',
//WS_URL: import.meta.env.VITE_WS_URL || 'wss://api.languagelab.be/api/v1/ws',
//
WS_URL: import.meta.env.VITE_WS_URL || 'wss://languagelab.be/tmp-api/v1/ws',
// 1 week - 2 hours
WEEKLY_SURVEY_INTERVAL: (7 * 24 - 2) * 60 * 60 * 1000,
LEARNING_LANGUAGES: {
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter