From f38e8b38846c14ef4b385da882e1dd2d1fac5a8d Mon Sep 17 00:00:00 2001 From: Maximilian Kreuzkam Date: Wed, 25 Sep 2024 15:32:01 +0200 Subject: [PATCH 1/4] EW-1025: Add new tsp sync schedule to config. --- ansible/group_vars/develop/cfg.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml index f8e700706..cda810043 100644 --- a/ansible/group_vars/develop/cfg.yml +++ b/ansible/group_vars/develop/cfg.yml @@ -47,6 +47,7 @@ SERVER_DATA_DELETION_TRIGGER_CRONJOB_SCHEDULE: "{{ 60 | random(seed=NAMESPACE) } 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 }} 3 * * *" 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 * * * *" From f7c4b2912502d6bdd23628797b330ec6572e9ad7 Mon Sep 17 00:00:00 2001 From: Maximilian Kreuzkam Date: Thu, 26 Sep 2024 16:18:55 +0200 Subject: [PATCH 2/4] Add new with variable for tsp sync. --- ansible/group_vars/all/with.yml | 1 + ansible/group_vars/thr/instance_cfg.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/all/with.yml b/ansible/group_vars/all/with.yml index 9a63df5f2..99f0e6fd0 100644 --- a/ansible/group_vars/all/with.yml +++ b/ansible/group_vars/all/with.yml @@ -2,6 +2,7 @@ WITH_STORAGE: false WITH_ERWINIDM: true WITH_LDAP: false WITH_TSP: false +WITH_TSP_SYNC: false WITH_MONGO_DATABASES: false WITH_POSTGRES_DATABASES: false WITH_BRANCH_POSTGRES_DB_MANAGEMENT: false diff --git a/ansible/group_vars/thr/instance_cfg.yml b/ansible/group_vars/thr/instance_cfg.yml index 4444670de..02ab2eba6 100644 --- a/ansible/group_vars/thr/instance_cfg.yml +++ b/ansible/group_vars/thr/instance_cfg.yml @@ -75,4 +75,5 @@ NEXTCLOUD_SOCIALLOGIN_OIDC_INTERNAL_NAME: SchulcloudNextcloud FEATURE_NEXTCLOUD_TEAM_FILES_ENABLED: "true" NEXTCLOUD_SCOPES: "openid offline profile email groups" -WITH_TSP: true \ No newline at end of file +WITH_TSP: true +WITH_TSP_SYNC: "{{ FEATURE_TSP_SYNC_ENABLED }}" \ No newline at end of file From c4d4d145c0bb85ab9a0ac1f27d608d5e5678ce4a Mon Sep 17 00:00:00 2001 From: Maximilian Kreuzkam Date: Thu, 26 Sep 2024 16:23:12 +0200 Subject: [PATCH 3/4] set new with var to false. --- ansible/group_vars/thr/instance_cfg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/thr/instance_cfg.yml b/ansible/group_vars/thr/instance_cfg.yml index 02ab2eba6..136563c24 100644 --- a/ansible/group_vars/thr/instance_cfg.yml +++ b/ansible/group_vars/thr/instance_cfg.yml @@ -76,4 +76,4 @@ FEATURE_NEXTCLOUD_TEAM_FILES_ENABLED: "true" NEXTCLOUD_SCOPES: "openid offline profile email groups" WITH_TSP: true -WITH_TSP_SYNC: "{{ FEATURE_TSP_SYNC_ENABLED }}" \ No newline at end of file +WITH_TSP_SYNC: false \ No newline at end of file From 048acc936ea4818697f51f4c9b5e55cd5197d370 Mon Sep 17 00:00:00 2001 From: Maximilian Kreuzkam Date: Fri, 27 Sep 2024 15:30:18 +0200 Subject: [PATCH 4/4] remove variable. --- ansible/group_vars/thr/instance_cfg.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible/group_vars/thr/instance_cfg.yml b/ansible/group_vars/thr/instance_cfg.yml index 136563c24..4444670de 100644 --- a/ansible/group_vars/thr/instance_cfg.yml +++ b/ansible/group_vars/thr/instance_cfg.yml @@ -75,5 +75,4 @@ NEXTCLOUD_SOCIALLOGIN_OIDC_INTERNAL_NAME: SchulcloudNextcloud FEATURE_NEXTCLOUD_TEAM_FILES_ENABLED: "true" NEXTCLOUD_SCOPES: "openid offline profile email groups" -WITH_TSP: true -WITH_TSP_SYNC: false \ No newline at end of file +WITH_TSP: true \ No newline at end of file