From a872c1d969a9c4ed356f9440ab86f568237e8845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20=C3=96hlerking?= <103562092+MarvinOehlerkingCap@users.noreply.github.com> Date: Fri, 13 Dec 2024 14:39:01 +0100 Subject: [PATCH 1/2] N21-2313 Improve schulconnex group provisioning runtime (#1058) --- ansible/group_vars/all/config.yml | 20 ++++++++++++++++++++ ansible/group_vars/nbc/instance_cfg.yml | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index 80d279f90..e09f9fbf2 100644 --- a/ansible/group_vars/all/config.yml +++ b/ansible/group_vars/all/config.yml @@ -1016,6 +1016,21 @@ configuration_all: server: true client: false nuxtclient: false + SCHULCONNEX_CLIENT__PERSON_INFO_TIMEOUT_IN_MS: + value: "3000" + server: true + client: false + nuxtclient: false + SCHULCONNEX_CLIENT__PERSONEN_INFO_TIMEOUT_IN_MS: + value: "120000" + server: true + client: false + nuxtclient: false + SCHULCONNEX_CLIENT__POLICIES_INFO_TIMEOUT_IN_MS: + value: "4000" + server: true + client: false + nuxtclient: false FEATURE_SCHULCONNEX_COURSE_SYNC_ENABLED: server: true client: true @@ -1059,6 +1074,11 @@ configuration_all: server: true client: false nuxtclient: false + PROVISIONING_SCHULCONNEX_GROUP_USERS_LIMIT: + value: "1000" + server: true + client: false + nuxtclient: false BOARD_COLLABORATION_URI: value: "wss://{{ DOMAIN }}" server: true diff --git a/ansible/group_vars/nbc/instance_cfg.yml b/ansible/group_vars/nbc/instance_cfg.yml index 0633c97d3..9aec40293 100644 --- a/ansible/group_vars/nbc/instance_cfg.yml +++ b/ansible/group_vars/nbc/instance_cfg.yml @@ -47,7 +47,7 @@ FEATURE_SHOW_MIGRATION_WIZARD: "true" FEATURE_USER_MIGRATION_ENABLED: "true" FEATURE_SCHULCONNEX_COURSE_SYNC_ENABLED: "true" FEATURE_MIGRATION_WIZARD_WITH_USER_LOGIN_MIGRATION: "true" -FEATURE_OTHER_GROUPUSERS_PROVISIONING_ENABLED: "false" +FEATURE_OTHER_GROUPUSERS_PROVISIONING_ENABLED: "true" FEATURE_SCHULCONNEX_MEDIA_LICENSE_ENABLED: "true" FEATURE_PREFERRED_CTL_TOOLS_ENABLED: "true" FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: "true" From 09b9e046b8c56c60850b49880a5e88b9b6d30261 Mon Sep 17 00:00:00 2001 From: Igor Richter <93926487+IgorCapCoder@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:28:03 +0100 Subject: [PATCH 2/2] N21-2138 preferred tools feature (#1062) * enable preferred tools feature --- ansible/host_vars/prod-nbc/cfg.yml | 1 - ansible/host_vars/ref-nbc/cfg.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/ansible/host_vars/prod-nbc/cfg.yml b/ansible/host_vars/prod-nbc/cfg.yml index 1b1f3b576..ea8259a4d 100644 --- a/ansible/host_vars/prod-nbc/cfg.yml +++ b/ansible/host_vars/prod-nbc/cfg.yml @@ -20,6 +20,5 @@ SCHULCONNEX_CLIENT__TOKEN_ENDPOINT: "https://auth.moin.schule/realms/moins/proto PROVISIONING_SCHULCONNEX_POLICIES_INFO_URL: "https://api-dienste.moin.schule/v1/policies-info" -FEATURE_PREFERRED_CTL_TOOLS_ENABLED: "false" JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAx3s+uLFUG4TSEvXvPu8Kb9UqX5VKIlBjFggoprxbtDShykL+O+lY\nZNG2XJoZ1OCwsGify617OOr/+3XmPChXbDTiuAZAZv945zhZ6ebtkAkKvAzf1jU+\n0ZoidcrpjebCn5oZyZqLJm1uNRxlFkKKJSactc7DTT99NB/AP7CPBum6k5QG+XcB\nsn9KMzPB4jx2PFoMwDU7vOUbHqPrj+0n3lW8/xMcgwVqoWFE11C8oDSSZNcByATf\n8AfX4lfREmtj0HAD6KSXEiT+OM53KWhq7Sz8icE+eiq8oLka2T6kI7gP1N2+9ycq\nh+CtS30ABvQi1Z6meCOjPk8HOFFa3Vj5o2pnrx6cXng4EQL59Y4NzhOclkxOUrUm\nAzWT51g1EdfjTh4PYNCQNJdbfcHL8/H3y8Khg6YCE/6qU7lFyt2aLOriy0d7fTCP\nCA0eQPE71PtYmncW/vk9SCHfQG3Xri3si3MkRQyshYwKBEBIc0Is5owsByAyqxwU\n0NIv1bo7aSHSTt5Q5WYu9wku7YPRpfYprJs5GjlZUMRD++CHSdQz83pi331EsAyd\nPEccVP7tT3+cHlyF/5+qV5QIZ1da4c+ODydbsyYwpjQh9SReAQtZDkW6l/OcT3cp\n9zXc7mK1dgHMlgkHMR1D8qCCOj0CmFNdjlCQSbV0hXOeowBY8EGPBkkCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n' FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: "false" diff --git a/ansible/host_vars/ref-nbc/cfg.yml b/ansible/host_vars/ref-nbc/cfg.yml index c12ba33dc..d0353b7ae 100644 --- a/ansible/host_vars/ref-nbc/cfg.yml +++ b/ansible/host_vars/ref-nbc/cfg.yml @@ -13,6 +13,5 @@ HYDRA_ISSUER_URL_SUFFIX: "/" # Migration wizard FEATURE_USER_MIGRATION_SYSTEM_ID: "62dab6401c473a01956a0d7d" -FEATURE_PREFERRED_CTL_TOOLS_ENABLED: "false" JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAuOzRE8DED9QaLtlnMUSNsz6ulucjKBpHfyGr8RAfowP9NtEaOVCv\nnWL2guKUY1rbl1mJMa56bJ+ZYvCUgYdLbRERpDK5mZtaEQ5SoNZ2qYWTEB58Dvm7\nR8OQZ2m3Hv6BZuiBSqWexl7Ns869yBAeE3842Frkm7wjnVG5cc7kp4H0oXTgGQ3d\n8lDswj8VL7h1w1NEDxd2+6IHE0MNnrvo3vcyLG5r3PNYLQZIRGlU0d5xNCUx+ewn\nVBlBaOfJ3cTp+Kl5Q7NBqttya0+YdmpZmcwk20GT89UhCt5EC7G1YyOcwtBcRvBx\nu52A5Q2C2dUZdy48M4Brhtbw8WpFuk54YUbdq0LtO6GCg79XkhSaBAYMKPAYiwWT\np53B+cWiCEKPdX5X7UoE2GVA1ycMRxarpUjz386ckvOd+bMSWdf/41EeGBXhlaDQ\ndLfh/NVR2XJw7TVuxwgUP1qXNQHCG+oEM6LifhouVVESjyweL81w/ayBS0aiY85Q\nYnypmAxh44NrPRHRK56dnJjhqvVA9nSKi3r2EloHu61rQ1pFMy5G30w0xIa0I9Hy\n4DEGntdntEKwXZjtURdmfSZJdQh9pV6FO7UHioMTSbU3290/MaHeNm7SnmeSjodT\nVhSE9O8mXgpiofQAfj9ebv9VKLo55mDh+f/wVzSLRgxgsyKHMnKTBGMCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n' FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: "false"