Skip to content
Snippets Groups Projects
Commit da84dae0 authored by Thomas Kluyver's avatar Thomas Kluyver
Browse files

Merge branch 'feat/exflcalproxy' into 'master'

Use exflcalproxy by default for CalCat access

See merge request !810
parents ee818040 44f3243c
No related branches found
No related tags found
1 merge request!810Use exflcalproxy by default for CalCat access
...@@ -10,12 +10,12 @@ mdc: ...@@ -10,12 +10,12 @@ mdc:
user-secret: '@note add this to secrets file' user-secret: '@note add this to secrets file'
calcat: calcat:
base-api-url: http://exflcalproxy:8080/api
use-oauth2: false
token-url: https://in.xfel.eu/calibration/oauth/token
auth-url: https://in.xfel.eu/calibration/oauth/authorize auth-url: https://in.xfel.eu/calibration/oauth/authorize
base-api-url: https://in.xfel.eu/calibration/api
refresh-url: https://in.xfel.eu/calibration/oauth/token refresh-url: https://in.xfel.eu/calibration/oauth/token
scope: '' scope: ''
token-url: https://in.xfel.eu/calibration/oauth/token
use-oauth2: true
user-email: calibration@example.com user-email: calibration@example.com
user-id: '@note add this to secrets file' user-id: '@note add this to secrets file'
user-secret: '@note add this to secrets file' user-secret: '@note add this to secrets file'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment