From 02b7f89be90b3b71a53516565c8de4516fdfb0dd Mon Sep 17 00:00:00 2001 From: Maximilian Kreuzkam Date: Thu, 27 Feb 2025 11:49:33 +0100 Subject: [PATCH 1/2] EW-1012: Remove legacy TSP Sync. --- ansible/group_vars/all/config.yml | 15 --------------- ansible/group_vars/all/with.yml | 1 - ansible/group_vars/develop/cfg.yml | 2 -- ansible/group_vars/thr/instance_cfg.yml | 5 ----- ansible/host_vars/prod-thr/with.yml | 3 +-- ansible/host_vars/ref-thr/with.yml | 3 +-- ansible/host_vars/thr_host/cfg.yml | 1 - ansible/host_vars/thr_host/with.yml | 3 +-- 8 files changed, 3 insertions(+), 30 deletions(-) diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index c0647ab7f..7f97ae8a9 100644 --- a/ansible/group_vars/all/config.yml +++ b/ansible/group_vars/all/config.yml @@ -285,23 +285,12 @@ configuration_all: server: true client: true # TSP - FEATURE_TSP_ENABLED: - value: "false" - server: true - client: false - TSP_API_BASE_URL: - server: true - client: false TSP_API_CLIENT_BASE_URL: server: true client: false TSP_API_CLIENT_TOKEN_LIFETIME_MS: server: true client: false - TSP_SCHOOL_SYNCER__SCHOOL_LIMIT: - value: "10" - server: true - client: false TSP_SYNC_MIGRATION_LIMIT: server: true client: false @@ -320,10 +309,6 @@ configuration_all: TSP_SYNC_DATA_DAYS_TO_FETCH: server: true client: false - TSP_SCHOOL_SYNCER__STUDENTS_TEACHERS_CLASSES_LIMIT: - value: "150" - server: true - client: false FEATURE_TSP_SYNC_ENABLED: server: true client: false diff --git a/ansible/group_vars/all/with.yml b/ansible/group_vars/all/with.yml index 7cc2f96d9..15b4ccca4 100644 --- a/ansible/group_vars/all/with.yml +++ b/ansible/group_vars/all/with.yml @@ -1,7 +1,6 @@ WITH_STORAGE: false WITH_ERWINIDM: true WITH_LDAP: false -WITH_TSP: false WITH_TSP_SYNC: false WITH_MONGO_DATABASES: false WITH_POSTGRES_DATABASES: false diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml index ae8663bc5..a1317e9c5 100644 --- a/ansible/group_vars/develop/cfg.yml +++ b/ansible/group_vars/develop/cfg.yml @@ -47,8 +47,6 @@ TLDRAW_FILE_DELETION_CRONJOB_SCHEDULE: "{{ 60 | random(seed=NAMESPACE) }} * * * SERVER_LDAP_SYNC_FULL_CRONJOB: "{{ 60 | random(seed=NAMESPACE) }} * * * *" SERVER_TSP_RANDOM: "{{ 20 | random(seed=NAMESPACE) }}" SERVER_TSP_SYNC_CRONJOB_SCHEDULE: "{{ SERVER_TSP_RANDOM|int + 9 }} 20 * * *" -SERVER_TSP_SYNC_BASE_CRONJOB: "{{ SERVER_TSP_RANDOM|int + 9 }} 3 * * *" -SERVER_TSP_SYNC_SCHOOL_CRONJOB: "{{ SERVER_TSP_RANDOM|int + 39 }} 3 * * *" ROCKETCHAT_FIXUP_CRONJOB_SCHEDULE: "{{ 5 | random(seed=NAMESPACE) }}/5 * * * *" SERVER_VIDIS_SYNC_CRONJOB_SCHEDULE: "{{ 20 | random(seed=NAMESPACE) }} 4 * * *" SERVER_MEDIA_METADATA_SYNC_CRONJOB_SCHEDULE: "{{ 30 | random(seed=NAMESPACE) }} 2 * * *" diff --git a/ansible/group_vars/thr/instance_cfg.yml b/ansible/group_vars/thr/instance_cfg.yml index 6b23c8a65..d2babdce3 100644 --- a/ansible/group_vars/thr/instance_cfg.yml +++ b/ansible/group_vars/thr/instance_cfg.yml @@ -54,9 +54,6 @@ PORT_SERVER: 3030 PORT_FILE_SERVICE: 4444 PORT_METRICS_SERVER: 9090 -# TSP (Thüringer Schulportal) -FEATURE_TSP_ENABLED: "true" - # Identity Management IDENTITY_MANAGEMENT__TENANT: "{{ SC_THEME }}" IDENTITY_MANAGEMENT__CLIENTID: "{{ SC_THEME }}" @@ -74,5 +71,3 @@ COLLABORATIVE_STORAGE_PROVIDER: Nextcloud NEXTCLOUD_SOCIALLOGIN_OIDC_INTERNAL_NAME: SchulcloudNextcloud FEATURE_NEXTCLOUD_TEAM_FILES_ENABLED: "false" NEXTCLOUD_SCOPES: "openid offline profile email groups" - -WITH_TSP: true diff --git a/ansible/host_vars/prod-thr/with.yml b/ansible/host_vars/prod-thr/with.yml index c9ecb4786..314f3cb43 100644 --- a/ansible/host_vars/prod-thr/with.yml +++ b/ansible/host_vars/prod-thr/with.yml @@ -1,2 +1 @@ -WITH_TSP_SYNC: true -WITH_TSP: false \ No newline at end of file +WITH_TSP_SYNC: true \ No newline at end of file diff --git a/ansible/host_vars/ref-thr/with.yml b/ansible/host_vars/ref-thr/with.yml index 4008202aa..500d4cf55 100644 --- a/ansible/host_vars/ref-thr/with.yml +++ b/ansible/host_vars/ref-thr/with.yml @@ -1,4 +1,3 @@ WITH_STORAGE: true WITH_H5P_EDITOR: true -WITH_TSP_SYNC: true -WITH_TSP: false \ No newline at end of file +WITH_TSP_SYNC: true \ No newline at end of file diff --git a/ansible/host_vars/thr_host/cfg.yml b/ansible/host_vars/thr_host/cfg.yml index 79047842d..390e39505 100644 --- a/ansible/host_vars/thr_host/cfg.yml +++ b/ansible/host_vars/thr_host/cfg.yml @@ -1,5 +1,4 @@ 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=/ diff --git a/ansible/host_vars/thr_host/with.yml b/ansible/host_vars/thr_host/with.yml index c9ecb4786..314f3cb43 100644 --- a/ansible/host_vars/thr_host/with.yml +++ b/ansible/host_vars/thr_host/with.yml @@ -1,2 +1 @@ -WITH_TSP_SYNC: true -WITH_TSP: false \ No newline at end of file +WITH_TSP_SYNC: true \ No newline at end of file From a84f593d5f82642dedd1963fba92a130477723f5 Mon Sep 17 00:00:00 2001 From: Maximilian Kreuzkam Date: Thu, 27 Feb 2025 13:49:26 +0100 Subject: [PATCH 2/2] Missing changes. --- ansible/host_vars/prod-thr/cfg.yml | 1 - ansible/host_vars/ref-thr/cfg.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/ansible/host_vars/prod-thr/cfg.yml b/ansible/host_vars/prod-thr/cfg.yml index eed3067e2..553ee740b 100644 --- a/ansible/host_vars/prod-thr/cfg.yml +++ b/ansible/host_vars/prod-thr/cfg.yml @@ -4,7 +4,6 @@ DOMAIN: schulcloud-thueringen.de AWS_ENDPOINT_URL: https://s3.hidrive.strato.com ALERT_STATUS_URL: https://status.schulcloud-thueringen.de/ NOT_AUTHENTICATED_REDIRECT_URL: "https://www.schulportal-thueringen.de/" -TSP_API_BASE_URL: https://www.schulportal-thueringen.de TSP_API_BASE_NO_WWW_URL: https://schulportal-thueringen.de ROOT_URL_REDIRECT: https://schulportal-thueringen.de/thueringer_schulcloud diff --git a/ansible/host_vars/ref-thr/cfg.yml b/ansible/host_vars/ref-thr/cfg.yml index e9bc52f30..124db6633 100644 --- a/ansible/host_vars/ref-thr/cfg.yml +++ b/ansible/host_vars/ref-thr/cfg.yml @@ -3,7 +3,6 @@ DOMAIN: test.schulcloud-thueringen.de ALERT_STATUS_URL: https://status.schulcloud-thueringen.de/ NOT_AUTHENTICATED_REDIRECT_URL: "https://test.schulportal-thueringen.de/" -TSP_API_BASE_URL: https://test.schulportal-thueringen.de ROOT_URL_REDIRECT: https://test.schulportal-thueringen.de/thueringer_schulcloud NEXTCLOUD_REDIRECT_URL: https://nextcloud.test.schulcloud-thueringen.de/apps/files/?dir=/