Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EW-1012: Remove legacy TSP Sync. #1118

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions ansible/group_vars/all/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion ansible/group_vars/all/with.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions ansible/group_vars/develop/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 * * *"
Expand Down
5 changes: 0 additions & 5 deletions ansible/group_vars/thr/instance_cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand All @@ -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
1 change: 0 additions & 1 deletion ansible/host_vars/prod-thr/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ansible/host_vars/prod-thr/with.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
WITH_TSP_SYNC: true
WITH_TSP: false
WITH_TSP_SYNC: true
1 change: 0 additions & 1 deletion ansible/host_vars/ref-thr/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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=/
Expand Down
3 changes: 1 addition & 2 deletions ansible/host_vars/ref-thr/with.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
WITH_STORAGE: true
WITH_H5P_EDITOR: true
WITH_TSP_SYNC: true
WITH_TSP: false
WITH_TSP_SYNC: true
1 change: 0 additions & 1 deletion ansible/host_vars/thr_host/cfg.yml
Original file line number Diff line number Diff line change
@@ -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=/
Expand Down
3 changes: 1 addition & 2 deletions ansible/host_vars/thr_host/with.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
WITH_TSP_SYNC: true
WITH_TSP: false
WITH_TSP_SYNC: true