Skip to content

Only one manage per access instance #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oharsta wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −17
Open

Only one manage per access instance #673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 33 additions & 17 deletions roles/openaccess/templates/serverapplication.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ server:
spring:
main:
banner-mode: "off"
cache:
type: simple
session:
jdbc:
cleanup-cron: "-"
Expand Down Expand Up @@ -108,6 +110,7 @@ config:
sram: "https://{{ env }}.sram.surf.nl/"
service_desk: "https://servicedesk.surf.nl/jira/plugins/servlet/desk/user/requests?reporter=all"
feedback_widget_enabled: true
test_environment: {{ openconextaccess.test_environment }}
# For other environments, move to group_vars
identity_providers:
- name: "SXS IdP"
Expand Down Expand Up @@ -147,6 +150,8 @@ gui:

feature:
enable-performance-seed: False
statistics-enabled: False
stepup-required: False

email:
from: "{{ noreply_email }}"
Expand All @@ -158,17 +163,10 @@ email:

manage:
enabled: True
activeManage: TEST
test:
url: {{ openconextaccess.managetest.url }}
user: {{ openconextaccess.managetest.user }}
password: {{ openconextaccess.managetest.password }}
defaultState: prodaccepted
prod:
url: {{ openconextaccess.manageprod.url }}
user: {{ openconextaccess.manageprod.user }}
password: {{ openconextaccess.managetest.password }}
defaultState: testaccepted
url: {{ openconextaccess.managetest.url }}
user: {{ openconextaccess.managetest.user }}
password: {{ openconextaccess.managetest.password }}
defaultState: testaccepted
# If manage is disabled (e.g. enabled: False) the staticManageDirectory is the directory where the {metadata_type}.json files
# are located. This can also be an absolute file path, e.g. file:///opt/openconext/invite/manage
staticManageDirectory: classpath:/manage
Expand All @@ -180,18 +178,36 @@ invite:
user: {{ invite.access_user }}
password: "{{ invite.access_secret }}"

s3storage:
url: {{ openconextaccess.s3_storage.url }}
key: {{ openconextaccess.s3_storage.key }}
secret: {{ openconextaccess.s3_storage.secret }}
bucket: {{ openconextaccess.s3_storage.bucket }}

statistics:
enabled: {{ openconextaccess.statistics.enabled }}
url: {{ openconextaccess.statistics.url }}
user: {{ openconextaccess.statistics.user }}
password: {{ openconextaccess.statistics.password }}

s3storage:
url: {{ openconextaccess.s3_storage.url }}
key: {{ openconextaccess.s3_storage.key }}
secret: {{ openconextaccess.s3_storage.secret }}
bucket: {{ openconextaccess.s3_storage.bucket }}

ohdear:
apiKey: "test-token"
baseUrl: http://localhost:8089/api
enabled: false

springdoc:
pathsToMatch: "/api/v1/**"
api-docs:
path: "/ui/api-docs"
enabled: false
swagger-ui:
path: "/ui/api-ui.html"
enabled: false
operationsSorter: method
oauth:
client-id: ${spring.security.oauth2.client.registration.oidcng.client-id}
client-secret: ${spring.security.oauth2.client.registration.oidcng.client-secret}
use-basic-authentication-with-access-code-grant: true

management:
health:
Expand Down