DMC/scipro
7
0
Fork 0
Code Issues 27 Pull Requests 4 Actions Projects 1 Wiki Activity

Deadline visible in "Rough draft approval" page #106

Merged
ansv7779 merged 7 commits from rough-draft-approval-deadline into develop 2025-02-12 11:07:55 +01:00
Conversation 3 Commits 7 Files Changed 6 +20 -1
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5490750d83 - Show all commits

19
compose-branch-deploy.yaml
View File

@ -21,6 +21,7 @@ services:
- OAUTH2_RESOURCE_SERVER_ID=scipro_api_client - OAUTH2_RESOURCE_SERVER_ID=scipro_api_client
- OAUTH2_RESOURCE_SERVER_SECRET=scipro_api_secret - OAUTH2_RESOURCE_SERVER_SECRET=scipro_api_secret
- OAUTH2_RESOURCE_SERVER_INTROSPECTION_URI=https://oauth2-${VHOST}/introspect - OAUTH2_RESOURCE_SERVER_INTROSPECTION_URI=https://oauth2-${VHOST}/introspect
- OAUTH2_GS_AUTHORIZATION_URI=https://oauth2-gs-${VHOST}/authorize
networks: networks:
- traefik - traefik
- internal - internal
@ -64,6 +65,24 @@ services:
- "traefik.http.routers.oauth2-${COMPOSE_PROJECT_NAME}.rule=Host(`oauth2-${VHOST}`)" - "traefik.http.routers.oauth2-${COMPOSE_PROJECT_NAME}.rule=Host(`oauth2-${VHOST}`)"
- "traefik.http.routers.oauth2-${COMPOSE_PROJECT_NAME}.tls.certresolver=letsencrypt" - "traefik.http.routers.oauth2-${COMPOSE_PROJECT_NAME}.tls.certresolver=letsencrypt"
oauth2-gs:
build:
context: https://github.com/dsv-su/toker.git
dockerfile: embedded.Dockerfile
restart: unless-stopped
environment:
- CLIENT_ID=scipro_client
- CLIENT_SECRET=scipro_secret
- CLIENT_REDIRECT_URI=https://${VHOST}/oauth/callback
- RESOURCE_SERVER_ID=scipro_api_client
- RESOURCE_SERVER_SECRET=scipro_api_secret
networks:
- traefik
labels:
- "traefik.enable=true"
- "traefik.http.routers.oauth2-${COMPOSE_PROJECT_NAME}.rule=Host(`oauth2-gs-${VHOST}`)"
- "traefik.http.routers.oauth2-${COMPOSE_PROJECT_NAME}.tls.certresolver=letsencrypt"
networks: networks:
traefik: traefik:
name: traefik name: traefik

2
war/src/main/resources/application-branch.properties
View File

@ -7,7 +7,7 @@ profile=DEV
# No secrets available for branch deployment to branch.dsv.su.se # No secrets available for branch deployment to branch.dsv.su.se
# Will have to set up some mock API for this later # Will have to set up some mock API for this later
service.grading.url= service.grading.url=
oauth.uri=${OAUTH2_AUTHORIZATION_URI:http://localhost:59734/authorize} oauth.uri=${OAUTH2_GS_AUTHORIZATION_URI:http://localhost:59734/authorize}
oauth.clientId=${OAUTH2_CLIENT_ID:scipro} oauth.clientId=${OAUTH2_CLIENT_ID:scipro}
oauth.clientSecret=${OAUTH2_CLIENT_SECRET:s3cr3t} oauth.clientSecret=${OAUTH2_CLIENT_SECRET:s3cr3t}
oauth.redirectUri={baseUrl}/oauth/callback oauth.redirectUri={baseUrl}/oauth/callback