From bb1ff3781e3fa7a1a0d58485ee4be2f58f5ac366 Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Wed, 8 Nov 2023 08:30:23 +0100 Subject: [PATCH 01/11] DMED-25 - set ES_DOMAIN to test instance --- ansible/group_vars/develop/cfg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml index 834211086..67563e3c9 100644 --- a/ansible/group_vars/develop/cfg.yml +++ b/ansible/group_vars/develop/cfg.yml @@ -4,7 +4,7 @@ FEATURE_IMSCC_COURSE_EXPORT_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/" From 47234e65f22db9b88904437d8e28d7c0489df703 Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Mon, 13 Nov 2023 13:03:25 +0100 Subject: [PATCH 02/11] DMED-25 - remove trailing backslash to `ES_DOMAIN` --- ansible/group_vars/develop/cfg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml index 67563e3c9..8df448a3b 100644 --- a/ansible/group_vars/develop/cfg.yml +++ b/ansible/group_vars/develop/cfg.yml @@ -4,7 +4,7 @@ FEATURE_IMSCC_COURSE_EXPORT_ENABLED: "true" FEATURE_ALLOW_INSECURE_LDAP_URL_ENABLED: "true" -ES_DOMAIN: "https://repo.test.mediathek.dev.dbildungsplattform.de/" +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/" From 6198c8b70f510105b92e606a591249c26c932d12 Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Mon, 18 Mar 2024 11:37:20 +0100 Subject: [PATCH 03/11] DMED-119 - allow access to edu-sharing's web components via Ingress --- ansible/group_vars/all/x_ingress.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/group_vars/all/x_ingress.yml b/ansible/group_vars/all/x_ingress.yml index 6ad885bb3..32715427f 100644 --- a/ansible/group_vars/all/x_ingress.yml +++ b/ansible/group_vars/all/x_ingress.yml @@ -117,6 +117,10 @@ default_ingress: path: /tools/context serviceName: nuxtclient-svc servicePort: "{{ NUXTCLIENT_PORT }}" + edu-sharing: + path: /vendor/edu-sharing + serviceName: nuxtclient-svc + servicePort: "{{ NUXTCLIENT_PORT }}" api: path: /api serviceName: default-backend-404-svc From 74899bcce3e71647979af7e51e7660d4a5c0a083 Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Tue, 28 May 2024 10:59:06 +0200 Subject: [PATCH 04/11] DMED-119 - add EDU_SHARING__APP_ID, EDU_SHARING__API_URL, EDU_SHARING__PRIVATE_KEY, and EDU_SHARING__PUBLIC_KEY configuration values to ansible/group_vars/all/config.yml --- ansible/group_vars/all/config.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index b9122ac72..b7bfea194 100644 --- a/ansible/group_vars/all/config.yml +++ b/ansible/group_vars/all/config.yml @@ -1059,3 +1059,23 @@ configuration_all: server: true client: false nuxtclient: false + EDU_SHARING__APP_ID: + value: schul-cloud + server: true + client: false + nuxtclient: false + EDU_SHARING__API_URL: + value: https://repo.test.mediathek.dev.dbildungsplattform.de/edu-sharing + server: true + client: false + nuxtclient: true + EDU_SHARING__PRIVATE_KEY: + value: "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCQYVZgfRisoKtp\nz0GT2ax8LyYdFH4tKCdHzo41kYu53YA/G3kEpGji8gAAGfkCZxKzpBdz+dfreJyS\n3OWnldxPdYpACfGZNEOlATuTuOl/m6l+OHgG6PixEbtzdB8cIX2KkjfE2rUTbE9s\nRqqDL5FC/ffsyyULf6JwVjydraGBTaSliEFY7Z3C92B1ntFgRhHNbGsKNwTVcIHo\nb1CCfH6eaEOzoou5ISDDXuhsVR5mafIZEQdxgytiJn2813g5VazKL9znzgY83li/\nuF62+IfcllCZEbYwuVWKEcKO+L/NnIMiymIu1pcM8cFdv+ojxq9xvgZZswgheO9x\n5aTEwActAgMBAAECggEAAN71ccOPazXU6DXTLscjXo8SQHP9MYc1JXO+MTMy5T4h\nez/5LOlTpfrRES8W7MgeZBhbTocf9vr/8XWE/8vMS8ETwmsiRUr8FXoPwpuyR44d\nfvYW6JkYgZ5FGTSGyNlS3ovJ66q+E43rChDVunuGTsx6uwzxU5kY1mtOwPdpKqnW\nQESDZUNUjfNK/lQuqHKRSnkXz6c6+6THWmE54lj64Z6q/hZfuXuq4j/acddSJaTl\nZVj3wVyWrbDe/ic8kmAFFJg9JbOkPyN41HC//Y6BQJYz+YmYQOxFMCSOusx9s2rl\nQtqmN7YGVnubCR7sY9hpCOgo1iWk3aSmd0WUTeUi6QKBgQDHLjEvQFc1oMPyYe54\novzdQdmBSxB+E+ejgcBUC0z8EGHDUlw8XsbTfB8CvMGu9rZeZJd/rc7aDmE5ixdp\np5ydBivr0a+W7xvGhraWZ+OrmKEIGGqoVQyNnKzKxAsreFAVTxgl9IvgzR4yk7+v\nuRdLlOjPRBioMcRPwrT4Jlh3YwKBgQC5kS3YZIdqU4OMG/5HED4mfRQ9chCHfC9K\n3y92e1/tqRU27toTAdDIXhWSkKUkjvjW5JcJD+Skdwe81vGqO9zQVs222E5jJH+t\negjXptQDRngoSvfq/JOrmWCEg1aXahDYnqecsiX8ScrNx2/spODl0NXQI/hDCsjX\n2zHP7VY0LwKBgC2jxv9lxdXy/ZNHn2YjKr/kO9ulgKTzGKvdql1XrY9AjbY85Aet\nS+/fzBdLezIFNCqS8CgAgppymxKdbYL3NirA5EWH6a0zIvEtox75tTB3q8Z4GdBy\nlIrKcMmRfGG8ktUfJ5Bi5b5gIeBC/LRePBlEiMgdeWzo4mvIWMFXwAOzAoGAUiiM\n+7nGmrTPEUFzm1L9sVy/kVTnLJU2+xdFlFebaUXrNp8ZvkCXh57gPjv8YetLERm0\nJTb8LDTnIByqcox+f19vRP0P96U5Qj09nP0n8StKF8zZZxjc6KTHruPXesJjIwVb\ngGz/lGu3dtROIZ/+UsHbaIQEbupfcfKCY2TZPdECgYEAkkVjUHg1MqTWmsWPgMTV\nWhVpWx/pNtXh05z9JZlyAm9JYpZ22YEn2PuhG390G6FFQs8EA5RKmrvSJG7kb3DO\nwpgqntWshZYesKp3SnVdTbO4uOcpVI4pIWuhkVRDQRhz877SS5IWDgAfAShOgp7/\nkTyEW9eSTsxKnnoByxr32O8=\n-----END PRIVATE KEY-----\n" + server: true + client: false + nuxtclient: false + EDU_SHARING__PUBLIC_KEY: + value: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkGFWYH0YrKCrac9Bk9ms\nfC8mHRR+LSgnR86ONZGLud2APxt5BKRo4vIAABn5AmcSs6QXc/nX63icktzlp5Xc\nT3WKQAnxmTRDpQE7k7jpf5upfjh4Buj4sRG7c3QfHCF9ipI3xNq1E2xPbEaqgy+R\nQv337MslC3+icFY8na2hgU2kpYhBWO2dwvdgdZ7RYEYRzWxrCjcE1XCB6G9Qgnx+\nnmhDs6KLuSEgw17obFUeZmnyGREHcYMrYiZ9vNd4OVWsyi/c584GPN5Yv7hetviH\n3JZQmRG2MLlVihHCjvi/zZyDIspiLtaXDPHBXb/qI8avcb4GWbMIIXjvceWkxMAH\nLQIDAQAB\n-----END PUBLIC KEY-----\n" + server: true + client: false + nuxtclient: false From a0f65c986db2e38e153d7080a8505e559ad8725f Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Tue, 28 May 2024 11:36:48 +0200 Subject: [PATCH 05/11] DMED-119 - add EDU_SHARING_SERVICE port configuration The code changes include adding the `PORT_EDU_SHARING_SERVICE` configuration to the `instance_cfg.yml` files for the `brb`, `dbc`, `nbc`, and `thr` groups. This port is set to `4450` for all instances. --- ansible/group_vars/brb/instance_cfg.yml | 1 + ansible/group_vars/dbc/instance_cfg.yml | 1 + ansible/group_vars/nbc/instance_cfg.yml | 1 + ansible/group_vars/thr/instance_cfg.yml | 1 + ansible/host_vars/prod-brb/pod.yml | 1 + ansible/host_vars/prod-dbc/pod.yml | 1 + ansible/host_vars/prod-nbc/pod.yml | 1 + ansible/host_vars/prod-thr/pod.yml | 1 + ansible/host_vars/ref-audit/pod.yml | 3 ++- ansible/host_vars/ref-brb/pod.yml | 1 + ansible/host_vars/ref-dbc/pod.yml | 1 + ansible/host_vars/ref-nbc/pod.yml | 1 + ansible/host_vars/ref-thr/pod.yml | 1 + 13 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/brb/instance_cfg.yml b/ansible/group_vars/brb/instance_cfg.yml index edb095d61..9701218ed 100644 --- a/ansible/group_vars/brb/instance_cfg.yml +++ b/ansible/group_vars/brb/instance_cfg.yml @@ -55,6 +55,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 8b60ea6e5..3908466d7 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/nbc/instance_cfg.yml b/ansible/group_vars/nbc/instance_cfg.yml index 7312ce4f8..e6ddb91d9 100644 --- a/ansible/group_vars/nbc/instance_cfg.yml +++ b/ansible/group_vars/nbc/instance_cfg.yml @@ -79,6 +79,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 b7004ee58..62d0fc3ee 100644 --- a/ansible/group_vars/thr/instance_cfg.yml +++ b/ansible/group_vars/thr/instance_cfg.yml @@ -51,6 +51,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 49e41e43e..ce6288da8 100644 --- a/ansible/host_vars/prod-brb/pod.yml +++ b/ansible/host_vars/prod-brb/pod.yml @@ -17,6 +17,7 @@ ROCKET_CHAT_REPLICAS: 10 REDIS_REPLICAS: 1 SHD_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 b15850805..bac0f9b84 100644 --- a/ansible/host_vars/prod-dbc/pod.yml +++ b/ansible/host_vars/prod-dbc/pod.yml @@ -18,6 +18,7 @@ ROCKET_CHAT_REPLICAS: 5 SHD_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 8d53b4851..6403dcaf4 100644 --- a/ansible/host_vars/prod-nbc/pod.yml +++ b/ansible/host_vars/prod-nbc/pod.yml @@ -18,6 +18,7 @@ REDIS_REPLICAS: 1 ROCKET_CHAT_REPLICAS: 5 SHD_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 bc73e0041..41bfd36a0 100644 --- a/ansible/host_vars/prod-thr/pod.yml +++ b/ansible/host_vars/prod-thr/pod.yml @@ -19,6 +19,7 @@ REDIS_REPLICAS: 1 ROCKET_CHAT_REPLICAS: 7 SHD_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 35f322ea3..fde40be48 100644 --- a/ansible/host_vars/ref-audit/pod.yml +++ b/ansible/host_vars/ref-audit/pod.yml @@ -20,7 +20,8 @@ ROCKET_CHAT_REPLICAS: 1 SHD_REPLICAS: 1 STORAGE_REPLICAS: 1 ERWINIDM_REPLICAS: 3 -API_FILE_STORAGE_REPLICAS: 3 +API_FILE_STORAGE_REPLICAS: +API_EDU_SHARING_REPLICAS: 1 AMQP_FILE_STORAGE_REPLICAS: 3 TLDRAW_CLIENT_REPLICAS: 3 TLDRAW_SERVER_REPLICAS: 3 diff --git a/ansible/host_vars/ref-brb/pod.yml b/ansible/host_vars/ref-brb/pod.yml index bb164d564..b42e24b1c 100644 --- a/ansible/host_vars/ref-brb/pod.yml +++ b/ansible/host_vars/ref-brb/pod.yml @@ -22,6 +22,7 @@ SHD_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 bb164d564..b42e24b1c 100644 --- a/ansible/host_vars/ref-dbc/pod.yml +++ b/ansible/host_vars/ref-dbc/pod.yml @@ -22,6 +22,7 @@ SHD_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 317aa6900..4c187125f 100644 --- a/ansible/host_vars/ref-nbc/pod.yml +++ b/ansible/host_vars/ref-nbc/pod.yml @@ -23,6 +23,7 @@ SHD_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 85993ac72..e2ec0acf0 100644 --- a/ansible/host_vars/ref-thr/pod.yml +++ b/ansible/host_vars/ref-thr/pod.yml @@ -23,6 +23,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 From 2a5c3e8dab716877e75b9df953090883d548c579 Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Wed, 29 May 2024 15:06:13 +0200 Subject: [PATCH 06/11] DMED-119 - remove private and public keys from `EduSharingConfig` --- ansible/group_vars/all/config.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index b7bfea194..8a42669c4 100644 --- a/ansible/group_vars/all/config.yml +++ b/ansible/group_vars/all/config.yml @@ -1069,13 +1069,3 @@ configuration_all: server: true client: false nuxtclient: true - EDU_SHARING__PRIVATE_KEY: - value: "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCQYVZgfRisoKtp\nz0GT2ax8LyYdFH4tKCdHzo41kYu53YA/G3kEpGji8gAAGfkCZxKzpBdz+dfreJyS\n3OWnldxPdYpACfGZNEOlATuTuOl/m6l+OHgG6PixEbtzdB8cIX2KkjfE2rUTbE9s\nRqqDL5FC/ffsyyULf6JwVjydraGBTaSliEFY7Z3C92B1ntFgRhHNbGsKNwTVcIHo\nb1CCfH6eaEOzoou5ISDDXuhsVR5mafIZEQdxgytiJn2813g5VazKL9znzgY83li/\nuF62+IfcllCZEbYwuVWKEcKO+L/NnIMiymIu1pcM8cFdv+ojxq9xvgZZswgheO9x\n5aTEwActAgMBAAECggEAAN71ccOPazXU6DXTLscjXo8SQHP9MYc1JXO+MTMy5T4h\nez/5LOlTpfrRES8W7MgeZBhbTocf9vr/8XWE/8vMS8ETwmsiRUr8FXoPwpuyR44d\nfvYW6JkYgZ5FGTSGyNlS3ovJ66q+E43rChDVunuGTsx6uwzxU5kY1mtOwPdpKqnW\nQESDZUNUjfNK/lQuqHKRSnkXz6c6+6THWmE54lj64Z6q/hZfuXuq4j/acddSJaTl\nZVj3wVyWrbDe/ic8kmAFFJg9JbOkPyN41HC//Y6BQJYz+YmYQOxFMCSOusx9s2rl\nQtqmN7YGVnubCR7sY9hpCOgo1iWk3aSmd0WUTeUi6QKBgQDHLjEvQFc1oMPyYe54\novzdQdmBSxB+E+ejgcBUC0z8EGHDUlw8XsbTfB8CvMGu9rZeZJd/rc7aDmE5ixdp\np5ydBivr0a+W7xvGhraWZ+OrmKEIGGqoVQyNnKzKxAsreFAVTxgl9IvgzR4yk7+v\nuRdLlOjPRBioMcRPwrT4Jlh3YwKBgQC5kS3YZIdqU4OMG/5HED4mfRQ9chCHfC9K\n3y92e1/tqRU27toTAdDIXhWSkKUkjvjW5JcJD+Skdwe81vGqO9zQVs222E5jJH+t\negjXptQDRngoSvfq/JOrmWCEg1aXahDYnqecsiX8ScrNx2/spODl0NXQI/hDCsjX\n2zHP7VY0LwKBgC2jxv9lxdXy/ZNHn2YjKr/kO9ulgKTzGKvdql1XrY9AjbY85Aet\nS+/fzBdLezIFNCqS8CgAgppymxKdbYL3NirA5EWH6a0zIvEtox75tTB3q8Z4GdBy\nlIrKcMmRfGG8ktUfJ5Bi5b5gIeBC/LRePBlEiMgdeWzo4mvIWMFXwAOzAoGAUiiM\n+7nGmrTPEUFzm1L9sVy/kVTnLJU2+xdFlFebaUXrNp8ZvkCXh57gPjv8YetLERm0\nJTb8LDTnIByqcox+f19vRP0P96U5Qj09nP0n8StKF8zZZxjc6KTHruPXesJjIwVb\ngGz/lGu3dtROIZ/+UsHbaIQEbupfcfKCY2TZPdECgYEAkkVjUHg1MqTWmsWPgMTV\nWhVpWx/pNtXh05z9JZlyAm9JYpZ22YEn2PuhG390G6FFQs8EA5RKmrvSJG7kb3DO\nwpgqntWshZYesKp3SnVdTbO4uOcpVI4pIWuhkVRDQRhz877SS5IWDgAfAShOgp7/\nkTyEW9eSTsxKnnoByxr32O8=\n-----END PRIVATE KEY-----\n" - server: true - client: false - nuxtclient: false - EDU_SHARING__PUBLIC_KEY: - value: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkGFWYH0YrKCrac9Bk9ms\nfC8mHRR+LSgnR86ONZGLud2APxt5BKRo4vIAABn5AmcSs6QXc/nX63icktzlp5Xc\nT3WKQAnxmTRDpQE7k7jpf5upfjh4Buj4sRG7c3QfHCF9ipI3xNq1E2xPbEaqgy+R\nQv337MslC3+icFY8na2hgU2kpYhBWO2dwvdgdZ7RYEYRzWxrCjcE1XCB6G9Qgnx+\nnmhDs6KLuSEgw17obFUeZmnyGREHcYMrYiZ9vNd4OVWsyi/c584GPN5Yv7hetviH\n3JZQmRG2MLlVihHCjvi/zZyDIspiLtaXDPHBXb/qI8avcb4GWbMIIXjvceWkxMAH\nLQIDAQAB\n-----END PUBLIC KEY-----\n" - server: true - client: false - nuxtclient: false From 1adbe6115ffdb7cfcb6154cb44ec960edadcbd43 Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Wed, 29 May 2024 20:35:14 +0200 Subject: [PATCH 07/11] DMED-119 - add `EDU_SHARING_CONNECT_SRC_URLS` and `EDU_SHARING_IMG_SRC_URLS` configuration values --- ansible/group_vars/all/config.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index 42e308c1e..daa89bcc7 100644 --- a/ansible/group_vars/all/config.yml +++ b/ansible/group_vars/all/config.yml @@ -1069,3 +1069,13 @@ configuration_all: server: true client: false nuxtclient: true + EDU_SHARING_CONNECT_SRC_URLS: + value: "https://repo.test.mediathek.dev.dbildungsplattform.de" + server: false + client: false + nuxtclient: true + EDU_SHARING_IMG_SRC_URLS: + value: "https://repo.test.mediathek.dev.dbildungsplattform.de" + server: false + client: false + nuxtclient: true From 7ff957deec37b8b786229d22c648d6575b1c1180 Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Wed, 29 May 2024 20:46:22 +0200 Subject: [PATCH 08/11] DMED-119 - revert API_FILE_STORAGE_REPLICAS to 3 in pod.yml for ref-audit --- ansible/host_vars/ref-audit/pod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/host_vars/ref-audit/pod.yml b/ansible/host_vars/ref-audit/pod.yml index fde40be48..ae73639cc 100644 --- a/ansible/host_vars/ref-audit/pod.yml +++ b/ansible/host_vars/ref-audit/pod.yml @@ -20,7 +20,7 @@ ROCKET_CHAT_REPLICAS: 1 SHD_REPLICAS: 1 STORAGE_REPLICAS: 1 ERWINIDM_REPLICAS: 3 -API_FILE_STORAGE_REPLICAS: +API_FILE_STORAGE_REPLICAS: 3 API_EDU_SHARING_REPLICAS: 1 AMQP_FILE_STORAGE_REPLICAS: 3 TLDRAW_CLIENT_REPLICAS: 3 From 787ae5fd1c0006a44c658d0a27b8df52b8c9ccef Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Mon, 8 Jul 2024 10:27:53 +0200 Subject: [PATCH 09/11] DMED-119 - add rendering service of test repo to H5P_FRAME_SRC_URLS for all `dev` instances --- ansible/group_vars/develop/cfg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml index 49c961dcc..8765a5403 100644 --- a/ansible/group_vars/develop/cfg.yml +++ b/ansible/group_vars/develop/cfg.yml @@ -6,7 +6,7 @@ FEATURE_ALLOW_INSECURE_LDAP_URL_ENABLED: "true" 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/ https://rendering.edu-2.services.sc-dev-edusharing.dbildungscloud.dev/ https://rendering.services.sc-dev-edusharing.dbildungscloud.dev/" FEATURE_H5P_EDITOR_ENABLED: "true" From cb0a5dc10e1f871d01ac4dad98db43cf8cf7b06d Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Mon, 8 Jul 2024 10:30:40 +0200 Subject: [PATCH 10/11] DMED-119 - only keep rendering service from test repo --- ansible/group_vars/develop/cfg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml index 8765a5403..fac739766 100644 --- a/ansible/group_vars/develop/cfg.yml +++ b/ansible/group_vars/develop/cfg.yml @@ -6,7 +6,7 @@ FEATURE_ALLOW_INSECURE_LDAP_URL_ENABLED: "true" ES_DOMAIN: "https://repo.test.mediathek.dev.dbildungsplattform.de" -H5P_FRAME_SRC_URLS: "https://rendering.test.mediathek.dev.dbildungsplattform.de/ 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" From 8214833a6f097c7839dbcfab6bbacbfceac71148 Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Tue, 10 Sep 2024 14:58:42 +0200 Subject: [PATCH 11/11] DMED-119 - refactor EDU_SHARING configuration variables --- ansible/group_vars/all/config.yml | 4 ---- ansible/group_vars/all/instance_config_all.yml | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index a9d081b62..8a0c9fd7e 100644 --- a/ansible/group_vars/all/config.yml +++ b/ansible/group_vars/all/config.yml @@ -1057,22 +1057,18 @@ configuration_all: client: true nuxtclient: false EDU_SHARING__APP_ID: - value: schul-cloud server: true client: false nuxtclient: false EDU_SHARING__API_URL: - value: https://repo.test.mediathek.dev.dbildungsplattform.de/edu-sharing server: true client: false nuxtclient: true EDU_SHARING_CONNECT_SRC_URLS: - value: "https://repo.test.mediathek.dev.dbildungsplattform.de" server: false client: false nuxtclient: true EDU_SHARING_IMG_SRC_URLS: - value: "https://repo.test.mediathek.dev.dbildungsplattform.de" 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 8e9eda9ef..de0f513e3 100644 --- a/ansible/group_vars/all/instance_config_all.yml +++ b/ansible/group_vars/all/instance_config_all.yml @@ -18,4 +18,9 @@ FEATURE_CTL_TOOLS_ENABLED: "true" FEATURE_LTI_TOOLS_ENABLED: "false" FEATURE_LTI_TOOLS_TAB_ENABLED: "false" FEATURE_CTL_TOOLS_TAB_ENABLED: "true" -FEATURE_COLUMN_BOARD_EXTERNAL_TOOLS_ENABLED: "true" \ No newline at end of file +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"