Skip to content
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.

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

DMED-119 - Spike: direktes Einbinden der edu-sharing-Suchumgebung in den "Lern-Store" der SVS #713

Open
wants to merge 42 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
bb1ff37
DMED-25 - set ES_DOMAIN to test instance
bergatco Nov 8, 2023
4c40f4d
Merge branch 'main' into DMED-25-its-jointly-demo
bergatco Nov 13, 2023
47234e6
DMED-25 - remove trailing backslash to `ES_DOMAIN`
bergatco Nov 13, 2023
dbc02c3
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Nov 27, 2023
5b0f530
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Nov 29, 2023
8f02576
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Nov 30, 2023
2f524c5
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Jan 4, 2024
5d4700c
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Jan 11, 2024
3249fec
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Jan 16, 2024
c39fcaf
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Jan 19, 2024
92fd3c6
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Jan 29, 2024
e3e0727
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Mar 1, 2024
d3e9459
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Mar 11, 2024
86e6c94
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Mar 14, 2024
5f54d5b
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Mar 15, 2024
6198c8b
DMED-119 - allow access to edu-sharing's web components via Ingress
bergatco Mar 18, 2024
193ae1c
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Mar 18, 2024
13a3e09
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Mar 20, 2024
d704b08
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Mar 25, 2024
b67c52e
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Mar 27, 2024
7d8a664
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco May 6, 2024
eee9fcd
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco May 16, 2024
31686a7
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco May 23, 2024
74899bc
DMED-119 - add EDU_SHARING__APP_ID, EDU_SHARING__API_URL, EDU_SHARING…
bergatco May 28, 2024
a0f65c9
DMED-119 - add EDU_SHARING_SERVICE port configuration
bergatco May 28, 2024
2a5c3e8
DMED-119 - remove private and public keys from `EduSharingConfig`
bergatco May 29, 2024
d5da28b
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco May 29, 2024
1adbe61
DMED-119 - add `EDU_SHARING_CONNECT_SRC_URLS` and `EDU_SHARING_IMG_SR…
bergatco May 29, 2024
7ff957d
DMED-119 - revert API_FILE_STORAGE_REPLICAS to 3 in pod.yml for ref-a…
bergatco May 29, 2024
3e91cca
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco May 30, 2024
71a5392
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Jul 1, 2024
c6cfbce
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Jul 1, 2024
383c263
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Jul 2, 2024
cba4a94
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Jul 8, 2024
787ae5f
DMED-119 - add rendering service of test repo to H5P_FRAME_SRC_URLS f…
bergatco Jul 8, 2024
cb0a5dc
DMED-119 - only keep rendering service from test repo
bergatco Jul 8, 2024
c219246
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Aug 26, 2024
f5ec009
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Sep 4, 2024
645e393
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Sep 9, 2024
8214833
DMED-119 - refactor EDU_SHARING configuration variables
bergatco Sep 10, 2024
f06ef7c
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Sep 16, 2024
0230211
Merge branch 'main' into DMED-119-integration-of-search-environment
bergatco Sep 23, 2024
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
16 changes: 16 additions & 0 deletions ansible/group_vars/all/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1056,3 +1056,19 @@ configuration_all:
server: true
client: true
nuxtclient: false
EDU_SHARING__APP_ID:
server: true
client: false
nuxtclient: false
EDU_SHARING__API_URL:
server: true
client: false
nuxtclient: true
EDU_SHARING_CONNECT_SRC_URLS:
server: false
client: false
nuxtclient: true
EDU_SHARING_IMG_SRC_URLS:
server: false
client: false
nuxtclient: true
5 changes: 5 additions & 0 deletions ansible/group_vars/all/instance_config_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ FEATURE_LTI_TOOLS_ENABLED: "false"
FEATURE_LTI_TOOLS_TAB_ENABLED: "false"
FEATURE_CTL_TOOLS_TAB_ENABLED: "true"
FEATURE_COLUMN_BOARD_EXTERNAL_TOOLS_ENABLED: "true"

EDU_SHARING__APP_ID: "schul-cloud"
EDU_SHARING__API_URL: "https://repo.test.mediathek.dev.dbildungsplattform.de/edu-sharing"
EDU_SHARING_CONNECT_SRC_URLS: "https://repo.test.mediathek.dev.dbildungsplattform.de"
EDU_SHARING_IMG_SRC_URLS: "https://repo.test.mediathek.dev.dbildungsplattform.de"
4 changes: 4 additions & 0 deletions ansible/group_vars/all/x_ingress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ default_ingress:
path: /tools/context
serviceName: nuxtclient-svc
servicePort: "{{ NUXTCLIENT_PORT }}"
edu-sharing:
path: /vendor/edu-sharing
serviceName: nuxtclient-svc
servicePort: "{{ NUXTCLIENT_PORT }}"
media_shelf:
path: /media-shelf
serviceName: nuxtclient-svc
Expand Down
1 change: 1 addition & 0 deletions ansible/group_vars/brb/instance_cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ WITH_LDAP: true
PORT_SERVER: 3030
PORT_FILE_SERVICE: 4444
PORT_FWU_LEARNING_CONTENTS: 4446
PORT_EDU_SHARING_SERVICE: 4450
PORT_METRICS_SERVER: 9090
# JWT CCONFIG
JWT_WHITELIST_ACCEPT_ALL: "false"
Expand Down
1 change: 1 addition & 0 deletions ansible/group_vars/dbc/instance_cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ WITH_LDAP: true
# PORTS
PORT_SERVER: 3030
PORT_FILE_SERVICE: 4444
PORT_EDU_SHARING_SERVICE: 4450
PORT_METRICS_SERVER: 9090
# JWT CCONFIG
JWT_WHITELIST_ACCEPT_ALL: "false"
Expand Down
4 changes: 2 additions & 2 deletions ansible/group_vars/develop/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ FEATURE_COMMON_CARTRIDGE_COURSE_IMPORT_ENABLED: "true"

FEATURE_ALLOW_INSECURE_LDAP_URL_ENABLED: "true"

ES_DOMAIN: "https://repository.sc-dev-edusharing.dbildungscloud.dev"
ES_DOMAIN: "https://repo.test.mediathek.dev.dbildungsplattform.de"

H5P_FRAME_SRC_URLS: "https://rendering.edu-2.services.sc-dev-edusharing.dbildungscloud.dev/ https://rendering.services.sc-dev-edusharing.dbildungscloud.dev/"
H5P_FRAME_SRC_URLS: "https://rendering.test.mediathek.dev.dbildungsplattform.de/"

FEATURE_H5P_EDITOR_ENABLED: "true"

Expand Down
1 change: 1 addition & 0 deletions ansible/group_vars/nbc/instance_cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ WITH_LDAP: true
# PORTS
PORT_SERVER: 3030
PORT_FILE_SERVICE: 4444
PORT_EDU_SHARING_SERVICE: 4450
PORT_METRICS_SERVER: 9090
# JWT CONFIG
JWT_WHITELIST_ACCEPT_ALL: "false"
Expand Down
1 change: 1 addition & 0 deletions ansible/group_vars/thr/instance_cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ DISABLED_BRUTE_FORCE_CHECK: "true"
# PORTS
PORT_SERVER: 3030
PORT_FILE_SERVICE: 4444
PORT_EDU_SHARING_SERVICE: 4450
PORT_METRICS_SERVER: 9090

# TSP (Thüringer Schulportal)
Expand Down
1 change: 1 addition & 0 deletions ansible/host_vars/prod-brb/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ REDIS_REPLICAS: 1
SHD_REPLICAS: 1
SHD_CLIENT_REPLICAS: 1
API_FILE_STORAGE_REPLICAS: 5
API_EDU_SHARING_REPLICAS: 1
AMQP_FILE_STORAGE_REPLICAS: 5
ERWINIDM_REPLICAS: 3
AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1
Expand Down
1 change: 1 addition & 0 deletions ansible/host_vars/prod-dbc/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ SHD_REPLICAS: 1
SHD_CLIENT_REPLICAS: 1
STORAGE_REPLICAS: 1
API_FILE_STORAGE_REPLICAS: 5
API_EDU_SHARING_REPLICAS: 1
AMQP_FILE_STORAGE_REPLICAS: 5
ERWINIDM_REPLICAS: 3
AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1
Expand Down
1 change: 1 addition & 0 deletions ansible/host_vars/prod-nbc/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ ROCKET_CHAT_REPLICAS: 5
SHD_REPLICAS: 1
SHD_CLIENT_REPLICAS: 1
API_FILE_STORAGE_REPLICAS: 5
API_EDU_SHARING_REPLICAS: 1
AMQP_FILE_STORAGE_REPLICAS: 5
ERWINIDM_REPLICAS: 3
AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1
Expand Down
1 change: 1 addition & 0 deletions ansible/host_vars/prod-thr/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ROCKET_CHAT_REPLICAS: 7
SHD_REPLICAS: 1
SHD_CLIENT_REPLICAS: 1
API_FILE_STORAGE_REPLICAS: 10
API_EDU_SHARING_REPLICAS: 2
AMQP_FILE_STORAGE_REPLICAS: 5
ERWINIDM_REPLICAS: 3
AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1
Expand Down
1 change: 1 addition & 0 deletions ansible/host_vars/ref-audit/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ SHD_CLIENT_REPLICAS: 1
STORAGE_REPLICAS: 1
ERWINIDM_REPLICAS: 3
API_FILE_STORAGE_REPLICAS: 3
API_EDU_SHARING_REPLICAS: 1
AMQP_FILE_STORAGE_REPLICAS: 3
TLDRAW_CLIENT_REPLICAS: 3
TLDRAW_SERVER_REPLICAS: 1
Expand Down
1 change: 1 addition & 0 deletions ansible/host_vars/ref-brb/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ SHD_CLIENT_REPLICAS: 1
STORAGE_REPLICAS: 1
ERWINIDM_REPLICAS: 3
API_FILE_STORAGE_REPLICAS: 3
API_EDU_SHARING_REPLICAS: 1
AMQP_FILE_STORAGE_REPLICAS: 3
AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1
AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
Expand Down
1 change: 1 addition & 0 deletions ansible/host_vars/ref-dbc/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ SHD_CLIENT_REPLICAS: 1
STORAGE_REPLICAS: 1
ERWINIDM_REPLICAS: 3
API_FILE_STORAGE_REPLICAS: 3
API_EDU_SHARING_REPLICAS: 1
AMQP_FILE_STORAGE_REPLICAS: 3
AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1
AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
Expand Down
1 change: 1 addition & 0 deletions ansible/host_vars/ref-nbc/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ SHD_CLIENT_REPLICAS: 1
STORAGE_REPLICAS: 1
ERWINIDM_REPLICAS: 3
API_FILE_STORAGE_REPLICAS: 3
API_EDU_SHARING_REPLICAS: 1
AMQP_FILE_STORAGE_REPLICAS: 3
AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1
AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
Expand Down
1 change: 1 addition & 0 deletions ansible/host_vars/ref-thr/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ERWINIDM_REPLICAS: 3
API_H5P_EDITOR_REPLICAS: 1
API_H5P_LIBRARY_MANAGEMENT_REPLICAS: 1
API_FILE_STORAGE_REPLICAS: 3
API_EDU_SHARING_REPLICAS: 1
AMQP_FILE_STORAGE_REPLICAS: 3
AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1
AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5
Expand Down
Loading