Merge branch 'main' into BC-8193-start-bbb

hpi-schul-cloud · Dec 16, 2024 · c0ccfeb · c0ccfeb
2 parents 9585d42 + 09b9e04
commit c0ccfeb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml
@@ -1021,6 +1021,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
@@ -1064,6 +1079,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
@@ -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"

diff --git 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
@@ -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"