diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index 8fa6b2282..8a0c9fd7e 100644 --- a/ansible/group_vars/all/config.yml +++ b/ansible/group_vars/all/config.yml @@ -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 diff --git a/ansible/group_vars/all/instance_config_all.yml b/ansible/group_vars/all/instance_config_all.yml index e90bb2b89..4ef2260a4 100644 --- a/ansible/group_vars/all/instance_config_all.yml +++ b/ansible/group_vars/all/instance_config_all.yml @@ -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" diff --git a/ansible/group_vars/all/x_ingress.yml b/ansible/group_vars/all/x_ingress.yml index 9d7d3279b..cd7e88dce 100644 --- a/ansible/group_vars/all/x_ingress.yml +++ b/ansible/group_vars/all/x_ingress.yml @@ -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 diff --git a/ansible/group_vars/brb/instance_cfg.yml b/ansible/group_vars/brb/instance_cfg.yml index a656e6622..fd92753a5 100644 --- a/ansible/group_vars/brb/instance_cfg.yml +++ b/ansible/group_vars/brb/instance_cfg.yml @@ -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" diff --git a/ansible/group_vars/dbc/instance_cfg.yml b/ansible/group_vars/dbc/instance_cfg.yml index 85af913af..95150214e 100644 --- a/ansible/group_vars/dbc/instance_cfg.yml +++ b/ansible/group_vars/dbc/instance_cfg.yml @@ -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" diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml index f8e700706..408ca562e 100644 --- a/ansible/group_vars/develop/cfg.yml +++ b/ansible/group_vars/develop/cfg.yml @@ -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" diff --git a/ansible/group_vars/nbc/instance_cfg.yml b/ansible/group_vars/nbc/instance_cfg.yml index 11a422a63..f8df4aa73 100644 --- a/ansible/group_vars/nbc/instance_cfg.yml +++ b/ansible/group_vars/nbc/instance_cfg.yml @@ -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" diff --git a/ansible/group_vars/thr/instance_cfg.yml b/ansible/group_vars/thr/instance_cfg.yml index 4444670de..5ed9319ff 100644 --- a/ansible/group_vars/thr/instance_cfg.yml +++ b/ansible/group_vars/thr/instance_cfg.yml @@ -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) diff --git a/ansible/host_vars/prod-brb/pod.yml b/ansible/host_vars/prod-brb/pod.yml index f22ace1c5..442d4b541 100644 --- a/ansible/host_vars/prod-brb/pod.yml +++ b/ansible/host_vars/prod-brb/pod.yml @@ -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 diff --git a/ansible/host_vars/prod-dbc/pod.yml b/ansible/host_vars/prod-dbc/pod.yml index 368f16c6d..9e59cbc33 100644 --- a/ansible/host_vars/prod-dbc/pod.yml +++ b/ansible/host_vars/prod-dbc/pod.yml @@ -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 diff --git a/ansible/host_vars/prod-nbc/pod.yml b/ansible/host_vars/prod-nbc/pod.yml index 51f3f6d26..420a86ff0 100644 --- a/ansible/host_vars/prod-nbc/pod.yml +++ b/ansible/host_vars/prod-nbc/pod.yml @@ -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 diff --git a/ansible/host_vars/prod-thr/pod.yml b/ansible/host_vars/prod-thr/pod.yml index 28b0e12a5..1e6540167 100644 --- a/ansible/host_vars/prod-thr/pod.yml +++ b/ansible/host_vars/prod-thr/pod.yml @@ -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 diff --git a/ansible/host_vars/ref-audit/pod.yml b/ansible/host_vars/ref-audit/pod.yml index 587c0ac3c..f499b0813 100644 --- a/ansible/host_vars/ref-audit/pod.yml +++ b/ansible/host_vars/ref-audit/pod.yml @@ -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 diff --git a/ansible/host_vars/ref-brb/pod.yml b/ansible/host_vars/ref-brb/pod.yml index e3b92ea50..7935ffbff 100644 --- a/ansible/host_vars/ref-brb/pod.yml +++ b/ansible/host_vars/ref-brb/pod.yml @@ -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 diff --git a/ansible/host_vars/ref-dbc/pod.yml b/ansible/host_vars/ref-dbc/pod.yml index e3b92ea50..7935ffbff 100644 --- a/ansible/host_vars/ref-dbc/pod.yml +++ b/ansible/host_vars/ref-dbc/pod.yml @@ -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 diff --git a/ansible/host_vars/ref-nbc/pod.yml b/ansible/host_vars/ref-nbc/pod.yml index 069aa4b26..85916b1ed 100644 --- a/ansible/host_vars/ref-nbc/pod.yml +++ b/ansible/host_vars/ref-nbc/pod.yml @@ -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 diff --git a/ansible/host_vars/ref-thr/pod.yml b/ansible/host_vars/ref-thr/pod.yml index d96c67ab3..a8b0eea7b 100644 --- a/ansible/host_vars/ref-thr/pod.yml +++ b/ansible/host_vars/ref-thr/pod.yml @@ -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