From 54cdf64bba953381582ff20c350c399a0a7dd072 Mon Sep 17 00:00:00 2001 From: bergatco <129839305+bergatco@users.noreply.github.com> Date: Wed, 27 Nov 2024 10:59:57 +0100 Subject: [PATCH] BC-7882 - Switch to new tldraw-server with copy tldraw-docs from MongoDB to S3 (#1023) --- ansible/group_vars/all/with.yml | 4 ++-- ansible/group_vars/develop/cfg.yml | 3 --- ansible/host_vars/prod-brb/pod.yml | 2 +- ansible/host_vars/prod-dbc/pod.yml | 2 +- ansible/host_vars/prod-nbc/pod.yml | 2 +- ansible/host_vars/prod-thr/pod.yml | 2 +- ansible/host_vars/ref-audit/pod.yml | 4 ++-- ansible/host_vars/ref-brb/pod.yml | 4 ++-- ansible/host_vars/ref-dbc/pod.yml | 4 ++-- ansible/host_vars/ref-nbc/pod.yml | 4 ++-- ansible/host_vars/ref-thr/pod.yml | 4 ++-- 11 files changed, 16 insertions(+), 19 deletions(-) diff --git a/ansible/group_vars/all/with.yml b/ansible/group_vars/all/with.yml index 0de7b2ce6..ca78e9c05 100644 --- a/ansible/group_vars/all/with.yml +++ b/ansible/group_vars/all/with.yml @@ -12,8 +12,8 @@ WITH_CALENDAR_INIT: false WITH_OIDCMOCK: false WITH_H5P_EDITOR: false WITH_H5P_LIBRARY_MANAGEMENT: false -WITH_TLDRAW: true -WITH_TLDRAW2: false +WITH_TLDRAW: false +WITH_TLDRAW2: true WITH_API_ADMIN: true WITH_MOIN_SCHULE: false WITH_UNSYNCED_ENTITIES_DELETION: false diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml index 6ba698e56..052643a49 100644 --- a/ansible/group_vars/develop/cfg.yml +++ b/ansible/group_vars/develop/cfg.yml @@ -52,8 +52,5 @@ 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 * * * *" -WITH_TLDRAW: true -WITH_TLDRAW2: false - # JWT_PUBLIC_KEY must be single quoted. When using double quotes newlines are replaced by spaces. JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAqYX8ofa9B+nL+IIPxHJSWgq/ZRYV95uwWkSsGAKG7pkRGhi9VrRr\nUxsVz8LWV2ZEL5+kgaPBmZgGixNk3Kmta86I3h6c0YS/GtD24D8rTdGnmH4LnwSv\n1VTfM5Wjo628cM7GD8SMSOr0iwMH/pEoDOISvfc4YPodO8KgUOFxEk/Py7fCIqNd\n2k60hFpodUt6aqP0gR2vt5Cd4qpRsxxQxJFmb3g57LOt3TOu6I2qD5FaMWEeyMdY\nPxm2DJex9FAxL5PtvDgMNa3u7L5tFysBy/axxpZtuPDYBzU5UeSG0izNEr1q/ZJr\nAqzcVaIvqXKM64iZS1CoP3QlCL/wcZUqPB25VHji7PV2Ddb23oyi7kNQ70c2hp8a\n3m8LRz9vVyNVby+yIdgMUaCboT/K8MocA9hNyb53zLMjDi+1QXx/CrU4BQQiPVvE\n+7wuywO9VGVX7Xfvm3aIWN3r6qPOb6IOhaoFXlXUaENEmyTxaRCsWzJTHL8Fao+x\nq+dwaarp32XfFLLj4LwMKosB5pSFXMXH8mhQiKTgU1BnVrcxvkNWbO84OLX4gHDq\nkODyueBDmkaUwEOuPZnPLZMi/EFHeJIf3xeqcexZ8MiIvu6GSSx+6ZSF2orRsZ6T\nvpD/2o9N4cgF8+U3ng37nM9ohaSSuG+ZnUFlQwEP7FJ7mHl/JS63VEUCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n' diff --git a/ansible/host_vars/prod-brb/pod.yml b/ansible/host_vars/prod-brb/pod.yml index f22ace1c5..39d842b1e 100644 --- a/ansible/host_vars/prod-brb/pod.yml +++ b/ansible/host_vars/prod-brb/pod.yml @@ -23,7 +23,7 @@ ERWINIDM_REPLICAS: 3 AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1 AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5 TLDRAW_CLIENT_REPLICAS: 3 -TLDRAW_SERVER_REPLICAS: 1 +TLDRAW_SERVER_REPLICAS: 5 ADMIN_API_SERVER_REPLICAS: 3 BOARD_COLLABORATION_SERVER_REPLICAS: 3 ANTIVIRUS_SCANFILE_MAX_REPLICA_COUNT: 20 diff --git a/ansible/host_vars/prod-dbc/pod.yml b/ansible/host_vars/prod-dbc/pod.yml index 368f16c6d..bd5379340 100644 --- a/ansible/host_vars/prod-dbc/pod.yml +++ b/ansible/host_vars/prod-dbc/pod.yml @@ -24,7 +24,7 @@ ERWINIDM_REPLICAS: 3 AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1 AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5 TLDRAW_CLIENT_REPLICAS: 3 -TLDRAW_SERVER_REPLICAS: 1 +TLDRAW_SERVER_REPLICAS: 5 ADMIN_API_SERVER_REPLICAS: 3 BOARD_COLLABORATION_SERVER_REPLICAS: 3 ANTIVIRUS_SCANFILE_MAX_REPLICA_COUNT: 20 diff --git a/ansible/host_vars/prod-nbc/pod.yml b/ansible/host_vars/prod-nbc/pod.yml index 51f3f6d26..eef40c41f 100644 --- a/ansible/host_vars/prod-nbc/pod.yml +++ b/ansible/host_vars/prod-nbc/pod.yml @@ -24,7 +24,7 @@ ERWINIDM_REPLICAS: 3 AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1 AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5 TLDRAW_CLIENT_REPLICAS: 3 -TLDRAW_SERVER_REPLICAS: 1 +TLDRAW_SERVER_REPLICAS: 5 ADMIN_API_SERVER_REPLICAS: 3 BOARD_COLLABORATION_SERVER_REPLICAS: 3 ANTIVIRUS_SCANFILE_MAX_REPLICA_COUNT: 20 diff --git a/ansible/host_vars/prod-thr/pod.yml b/ansible/host_vars/prod-thr/pod.yml index 28b0e12a5..b87ae4889 100644 --- a/ansible/host_vars/prod-thr/pod.yml +++ b/ansible/host_vars/prod-thr/pod.yml @@ -25,7 +25,7 @@ ERWINIDM_REPLICAS: 3 AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1 AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5 TLDRAW_CLIENT_REPLICAS: 3 -TLDRAW_SERVER_REPLICAS: 1 +TLDRAW_SERVER_REPLICAS: 5 ADMIN_API_SERVER_REPLICAS: 3 BOARD_COLLABORATION_SERVER_REPLICAS: 3 ANTIVIRUS_SCANFILE_MAX_REPLICA_COUNT: 20 diff --git a/ansible/host_vars/ref-audit/pod.yml b/ansible/host_vars/ref-audit/pod.yml index 587c0ac3c..d00fa928a 100644 --- a/ansible/host_vars/ref-audit/pod.yml +++ b/ansible/host_vars/ref-audit/pod.yml @@ -23,7 +23,7 @@ STORAGE_REPLICAS: 1 ERWINIDM_REPLICAS: 3 API_FILE_STORAGE_REPLICAS: 3 AMQP_FILE_STORAGE_REPLICAS: 3 -TLDRAW_CLIENT_REPLICAS: 3 -TLDRAW_SERVER_REPLICAS: 1 +TLDRAW_CLIENT_REPLICAS: 2 +TLDRAW_SERVER_REPLICAS: 2 ADMIN_API_SERVER_REPLICAS: 1 BOARD_COLLABORATION_SERVER_REPLICAS: 3 diff --git a/ansible/host_vars/ref-brb/pod.yml b/ansible/host_vars/ref-brb/pod.yml index e3b92ea50..bf44ab446 100644 --- a/ansible/host_vars/ref-brb/pod.yml +++ b/ansible/host_vars/ref-brb/pod.yml @@ -26,7 +26,7 @@ API_FILE_STORAGE_REPLICAS: 3 AMQP_FILE_STORAGE_REPLICAS: 3 AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1 AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5 -TLDRAW_CLIENT_REPLICAS: 3 -TLDRAW_SERVER_REPLICAS: 1 +TLDRAW_CLIENT_REPLICAS: 2 +TLDRAW_SERVER_REPLICAS: 2 ADMIN_API_SERVER_REPLICAS: 1 BOARD_COLLABORATION_SERVER_REPLICAS: 3 diff --git a/ansible/host_vars/ref-dbc/pod.yml b/ansible/host_vars/ref-dbc/pod.yml index e3b92ea50..bf44ab446 100644 --- a/ansible/host_vars/ref-dbc/pod.yml +++ b/ansible/host_vars/ref-dbc/pod.yml @@ -26,7 +26,7 @@ API_FILE_STORAGE_REPLICAS: 3 AMQP_FILE_STORAGE_REPLICAS: 3 AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1 AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5 -TLDRAW_CLIENT_REPLICAS: 3 -TLDRAW_SERVER_REPLICAS: 1 +TLDRAW_CLIENT_REPLICAS: 2 +TLDRAW_SERVER_REPLICAS: 2 ADMIN_API_SERVER_REPLICAS: 1 BOARD_COLLABORATION_SERVER_REPLICAS: 3 diff --git a/ansible/host_vars/ref-nbc/pod.yml b/ansible/host_vars/ref-nbc/pod.yml index 069aa4b26..22fc27740 100644 --- a/ansible/host_vars/ref-nbc/pod.yml +++ b/ansible/host_vars/ref-nbc/pod.yml @@ -27,7 +27,7 @@ API_FILE_STORAGE_REPLICAS: 3 AMQP_FILE_STORAGE_REPLICAS: 3 AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1 AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5 -TLDRAW_CLIENT_REPLICAS: 3 -TLDRAW_SERVER_REPLICAS: 1 +TLDRAW_CLIENT_REPLICAS: 2 +TLDRAW_SERVER_REPLICAS: 2 ADMIN_API_SERVER_REPLICAS: 1 BOARD_COLLABORATION_SERVER_REPLICAS: 3 diff --git a/ansible/host_vars/ref-thr/pod.yml b/ansible/host_vars/ref-thr/pod.yml index d96c67ab3..8d4054955 100644 --- a/ansible/host_vars/ref-thr/pod.yml +++ b/ansible/host_vars/ref-thr/pod.yml @@ -27,7 +27,7 @@ API_FILE_STORAGE_REPLICAS: 3 AMQP_FILE_STORAGE_REPLICAS: 3 AMQP_FILE_PREVIEW_MIN_REPLICA_COUNT: 1 AMQP_FILE_PREVIEW_MAX_REPLICA_COUNT: 5 -TLDRAW_CLIENT_REPLICAS: 3 -TLDRAW_SERVER_REPLICAS: 1 +TLDRAW_CLIENT_REPLICAS: 2 +TLDRAW_SERVER_REPLICAS: 2 ADMIN_API_SERVER_REPLICAS: 1 BOARD_COLLABORATION_SERVER_REPLICAS: 3