diff --git a/docker-compose.yml b/docker-compose.yml index 02b1411..87a179f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,18 @@ version: '3.4' services: pwa-gateway: build: context: . args: SERVICE_PORT: ${SERVICE_PORT} image: "${DOCKER_REGISTRY}wikitolearn/pwa-gateway:${DOCKER_IMAGE_PWA_GATEWAY_TAG}" environment: KEYCLOAK_URI: ${KEYCLOAK_URI} KEYCLOAK_AUTH_REALM: ${KEYCLOAK_AUTH_REALM} COURSE_MIDTIER_URI: ${COURSE_MIDTIER_URI} + MATH_MIDTIER_URI: ${MATH_MIDTIER_URI} SERVICE_PORT: ${SERVICE_PORT} SSL_ENABLED: ${SSL_ENABLED} MTLS_STATUS: ${MTLS_STATUS} ports: - ${SERVICE_PORT}:${SERVICE_PORT} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 66a9fde..8510ea6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,68 +1,71 @@ # Spring properties spring: application: name: PWAGateway output: ansi: enabled: DETECT # Management properties management: endpoints: web: base-path: /_meta path-mapping: health: status exposure: include: health,info,metrics health: defaults: enabled: false # Zuul properties zuul: sslHostnameValidationEnabled: false - prefix: /api/v1 + prefix: /api sensitive-headers: Cookie,Set-Cookie routes: history: - url: ${COURSE_MIDTIER_URI}/history/courses - path: /history/courses/** + url: ${COURSE_MIDTIER_URI}/v1/history/courses + path: /v1/history/courses/** courses: - url: ${COURSE_MIDTIER_URI}/courses - path: /courses/** + url: ${COURSE_MIDTIER_URI}/v1/courses + path: /v1/courses/** chapters: - url: ${COURSE_MIDTIER_URI}/chapters - path: /chapters/** + url: ${COURSE_MIDTIER_URI}/v1/chapters + path: /v1/chapters/** pages: - url: ${COURSE_MIDTIER_URI}/pages - path: /pages/** + url: ${COURSE_MIDTIER_URI}/v1/pages + path: /v1/pages/** + math: + url: ${MATH_MIDTIER_URI}/v1/math + path: /v1/math/** # Security properties security: oauth2: resource: user-info-uri: ${KEYCLOAK_URI}/auth/realms/${KEYCLOAK_AUTH_REALM}/protocol/openid-connect/userinfo token-info-uri: ${KEYCLOAK_URI}/auth/realms/${KEYCLOAK_AUTH_REALM}/protocol/openid-connect/token/introspect prefer-token-info: false jwk: key-set-uri: ${KEYCLOAK_URI}/auth/realms/${KEYCLOAK_AUTH_REALM}/protocol/openid-connect/certs # Loggin properties logging: pattern: file: '%d{"yyyy-MM-dd HH:mm:ss,SSS"} %-5level [%c] \(%thread\) : %msg%n' console: '%d{"yyyy-MM-dd HH:mm:ss,SSS"} %-5level [%c] \(%thread\) : %msg%n' # Server properties server: port: ${SERVICE_PORT} ssl: enabled: ${SSL_ENABLED} key-store: file:./app-keystore.jks key-store-password: changeme key-alias: client key-password: changeme trust-store: file:./app-truststore.jks trust-store-password: changeme client-auth: ${MTLS_STATUS} \ No newline at end of file