Merge branch 'main' into BC-8228-update-versions

ansible/group_vars/all/config.yml

@@ -399,28 +399,32 @@ configuration_all:
     server: true
     client: false
     nuxtclient: false
+  TSP_API_CLIENT_BASE_URL:
+    server: true
+    client: false
+    nuxtclient: false
+  TSP_API_CLIENT_TOKEN_LIFETIME_MS:
+    server: true
+    client: false
+    nuxtclient: false
   TSP_SCHOOL_SYNCER__SCHOOL_LIMIT:
     value: "10"
     server: true
     client: false
     nuxtclient: false
   TSP_SYNC_SCHOOL_LIMIT:
-    value: "10"
     server: true
     client: false
     nuxtclient: false
   TSP_SYNC_DATA_LIMIT:
-    value: "150"
     server: true
     client: false
     nuxtclient: false
   TSP_SYNC_SCHOOL_DAYS_TO_FETCH:
-    value: "1"
     server: true
     client: false
     nuxtclient: false
   TSP_SYNC_DATA_DAYS_TO_FETCH:
-    value: "1"
     server: true
     client: false
     nuxtclient: false
@@ -430,7 +434,6 @@ configuration_all:
     client: false
     nuxtclient: false
   FEATURE_TSP_SYNC_ENABLED:
-    value: "false"
     server: true
     client: false
     nuxtclient: false
@@ -1090,5 +1093,10 @@ configuration_all:
   JWT_PUBLIC_KEY:
     server: true
     client: false
-    nuxtclient: false  
+    nuxtclient: false
+  FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED:
+    value: "false"
+    server: true
+    client: true
+    nuxtclient: false
 

ansible/group_vars/all/instance_config_all.yml

@@ -18,4 +18,13 @@ 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"
+FEATURE_COLUMN_BOARD_EXTERNAL_TOOLS_ENABLED: "true"
+
+# TSP Sync
+FEATURE_TSP_SYNC_ENABLED: "false"
+TSP_SYNC_SCHOOL_LIMIT: "10"
+TSP_SYNC_DATA_LIMIT: "150"
+TSP_SYNC_SCHOOL_DAYS_TO_FETCH: "1"
+TSP_SYNC_DATA_DAYS_TO_FETCH: "1"
+TSP_API_CLIENT_BASE_URL: ""
+TSP_API_CLIENT_TOKEN_LIFETIME_MS: "30000"

ansible/group_vars/nbc/instance_cfg.yml

@@ -48,8 +48,9 @@ FEATURE_USER_MIGRATION_ENABLED: "true"
 FEATURE_SCHULCONNEX_COURSE_SYNC_ENABLED: "true"
 FEATURE_MIGRATION_WIZARD_WITH_USER_LOGIN_MIGRATION: "true"
 FEATURE_OTHER_GROUPUSERS_PROVISIONING_ENABLED: "true"
-FEATURE_SCHULCONNEX_MEDIA_LICENSE_ENABLED: "false"
+FEATURE_SCHULCONNEX_MEDIA_LICENSE_ENABLED: "true"
 FEATURE_PREFERRED_CTL_TOOLS_ENABLED: "true"
+FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: "true"
 
 TEACHER_STUDENT_VISIBILITY__IS_ENABLED_BY_DEFAULT: "false"
 TEACHER_STUDENT_VISIBILITY__IS_CONFIGURABLE: "true"

ansible/host_vars/prod-nbc/cfg.yml

@@ -24,3 +24,4 @@ PROVISIONING_SCHULCONNEX_POLICIES_INFO_URL: "https://api-dienste.moin.schule/v1/
 
 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"

ansible/host_vars/ref-nbc/cfg.yml

@@ -15,3 +15,4 @@ 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"

ansible/host_vars/thr_host/cfg.yml

@@ -1,6 +1,9 @@
-NOT_AUTHENTICATED_REDIRECT_URL: https://test.schulportal-thueringen.de/cas/login?service=https://{{DOMAIN}}/tsp-login
+NOT_AUTHENTICATED_REDIRECT_URL: "https://{{ DOMAIN }}/login?strategy=tsp"
 TSP_API_BASE_URL: https://test.schulportal-thueringen.de
 ROOT_URL_REDIRECT: https://test.schulportal-thueringen.de/thueringer_schulcloud
 
 NEXTCLOUD_REDIRECT_URL: https://nextcloud-thr.dbildungscloud.dev/apps/files/?dir=/
 NEXTCLOUD_BASE_URL: https://nextcloud-thr.dbildungscloud.dev/
+
+FEATURE_TSP_SYNC_ENABLED: "true"
+TSP_API_CLIENT_BASE_URL: https://test2.schulportal-thueringen.de/tip-ms/api

ansible/host_vars/thr_host/with.yml

@@ -0,0 +1 @@
+WITH_TSP_SYNC: "true"