Skip to content

Commit

Permalink
Merge branch 'main' into BC-7882-switch-to-new-tldraw-server
Browse files Browse the repository at this point in the history
  • Loading branch information
bergatco authored Nov 26, 2024
2 parents 0fd094f + 1a59f65 commit dae2173
Show file tree
Hide file tree
Showing 29 changed files with 106 additions and 138 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ configuration/
.repository/
.attach_pid*
sessions
.vscode/*

__pycache__
3 changes: 0 additions & 3 deletions ansible/group_vars/all/affinity.yml

This file was deleted.

4 changes: 0 additions & 4 deletions ansible/group_vars/all/clammit.yml

This file was deleted.

8 changes: 8 additions & 0 deletions ansible/group_vars/all/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,14 @@ configuration_all:
server: true
client: false
nuxtclient: false
TSP_SYNC_MIGRATION_LIMIT:
server: true
client: false
nuxtclient: false
FEATURE_TSP_MIGRATION_ENABLED:
server: true
client: false
nuxtclient: false
TSP_SYNC_SCHOOL_LIMIT:
server: true
client: false
Expand Down
10 changes: 0 additions & 10 deletions ansible/group_vars/all/erwin-idm.yml

This file was deleted.

6 changes: 0 additions & 6 deletions ansible/group_vars/all/external-secrets.yml

This file was deleted.

1 change: 1 addition & 0 deletions ansible/group_vars/all/git_repos.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# do not extend unless you have a new repo, they are ONLY used for meta-data inside deployments and similar
SCHULCLOUD_SERVER_REPO_NAME: schulcloud-server
SCHULCLOUD_CLIENT_REPO_NAME: schulcloud-client
NUXT_CLIENT_REPO_NAME: nuxt-client
Expand Down
1 change: 0 additions & 1 deletion ansible/group_vars/all/ingress_cfg.yml

This file was deleted.

15 changes: 14 additions & 1 deletion ansible/group_vars/all/instance_config_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ 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_MEDIA_SHELF_ENABLED: "true"

# TSP Sync
FEATURE_TSP_SYNC_ENABLED: "false"
Expand All @@ -27,4 +28,16 @@ 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"
TSP_API_CLIENT_TOKEN_LIFETIME_MS: "30000"
FEATURE_TSP_MIGRATION_ENABLED: "false"
TSP_SYNC_MIGRATION_LIMIT: "100"

ERWINIDM_PORT: 8089
ERWINIDM_PREFIX: idm.
ERWINIDM_SERVICE_MONITOR: true
ERWINIDM_ADMIN_HOSTNAME: "{{ ERWINIDM_ADMIN_PREFIX }}{{ DOMAIN }}"
ERWINIDM_ADMIN_PREFIX: idm-admin.
ERWINIDM_ADMIN_INGRESS_CLASS: management
ERWINIDM_ADMIN_CREATE_CERTIFICATE: true
ERWINIDM_ADMIN_TLS_AUTH_SECRET: erwinidm-tls-auth

4 changes: 0 additions & 4 deletions ansible/group_vars/all/keda.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
AFFINITY_ENABLE: true
ANIT_AFFINITY_NODEPOOL_ENABLE: true
ANIT_AFFINITY_NODEPOOL_TOPOLOGY_KEY: "cloud.ionos.com/nodepool-name"


EXTERNAL_SECRETS_OPERATOR: false
EXTERNAL_SECRETS_K8S_STORE: k8s-store
EXTERNAL_SECRETS_POSTFIX: ""
EXTERNAL_SECRETS_REFRESH_INTERVAL: "1m"
EXTERNAL_SECRETS_NAMESPACE: external-secrets
EXTERNAL_SECRETS_TOKEN_SECRET: external-secrets-k8s-store-token


PORT_H5P_EDITOR: 4448
H5P_LIBRARIES:
- H5P.Accordion
Expand Down Expand Up @@ -38,11 +51,29 @@ H5P_LIBRARIES:
- H5P.Summary
- H5P.Timeline
- H5P.TrueFalse
# could be defaults
H5P_PROXY_IMAGE_NAME: docker.io/nginx
H5P_PROXY_IMAGE_TAG: 1.27-alpine
H5P_PROXY_PORT: 80
H5P_PROXY_PREFIX: "h5p-"
H5P_PROXY_MAX_BODY_SIZE: "1G"
H5P_PROXY_CONNECT_TIMEOUT: "600s"
H5P_PROXY_READ_TIMEOUT: "600s"
H5P_PROXY_SEND_TIMEOUT: "600s"
H5P_PROXY_SEND_TIMEOUT: "600s"

INGRESS_CLASS: nginx

KEDA_ENABLED: true
SCALED_PREVIEW_GENERATOR_ENABLED: true
SCALED_API_WORKER_ENABLED: true
SCALED_ANTIVIRUS_SCANFILE_WORKER_ENABLED: true

MONGO_MANAGEMENT_PREFIX: ""
MONGO_MANAGEMENT_POSTFIX: ""

ONEPASSWORD: true
ONEPASSWORD_OPERATOR: true

POSTGRES_MANAGEMENT_PREFIX: ""
POSTGRES_MANAGEMENT_PORT: 5432
POSTGRES_MANAGEMENT_JOB_IMAGE: "quay.io/schulcloudverbund/infra-tools:4.1"
2 changes: 0 additions & 2 deletions ansible/group_vars/all/mongodb.yml

This file was deleted.

2 changes: 0 additions & 2 deletions ansible/group_vars/all/onepwd.yml

This file was deleted.

3 changes: 0 additions & 3 deletions ansible/group_vars/all/postgres.yml

This file was deleted.

1 change: 1 addition & 0 deletions ansible/group_vars/all/with.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ WITH_UNSYNCED_ENTITIES_DELETION: false
WITH_BOARD_COLLABORATION: false
WITH_MIGRATION_SYSTEMS: false
WITH_COMMON_CARTRIDGE: false
WITH_CLAMMIT: false
8 changes: 4 additions & 4 deletions ansible/host_vars/dev-loadtest-01/version.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.47.2
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.47.0
NUXT_CLIENT_IMAGE_TAG: 32.47.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SHD_CLIENT_IMAGE_TAG: 1.0.1
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.46.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.46.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.16
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.10
TLDRAW_CLIENT_IMAGE_TAG: 1.1.2
TLDRAW_SERVER_IMAGE_TAG: 32.47.0
TLDRAW_SERVER_IMAGE_TAG: 32.48.0
8 changes: 4 additions & 4 deletions ansible/host_vars/infra.dbildungscloud-01/version.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.47.2
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.47.0
NUXT_CLIENT_IMAGE_TAG: 32.47.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SHD_CLIENT_IMAGE_TAG: 1.0.1
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.46.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.46.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.16
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.10
TLDRAW_CLIENT_IMAGE_TAG: 1.1.2
TLDRAW_SERVER_IMAGE_TAG: 32.47.0
TLDRAW_SERVER_IMAGE_TAG: 32.48.0
8 changes: 4 additions & 4 deletions ansible/host_vars/prod-brb/version.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.47.2
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.47.0
NUXT_CLIENT_IMAGE_TAG: 32.47.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SHD_CLIENT_IMAGE_TAG: 1.0.1
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.46.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.46.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.16
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.10
TLDRAW_CLIENT_IMAGE_TAG: 1.1.2
TLDRAW_SERVER_IMAGE_TAG: 32.47.0
TLDRAW_SERVER_IMAGE_TAG: 32.48.0
8 changes: 4 additions & 4 deletions ansible/host_vars/prod-dbc/version.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.47.2
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.47.0
NUXT_CLIENT_IMAGE_TAG: 32.47.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SHD_CLIENT_IMAGE_TAG: 1.0.1
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.46.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.46.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.16
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.10
TLDRAW_CLIENT_IMAGE_TAG: 1.1.2
TLDRAW_SERVER_IMAGE_TAG: 32.47.0
TLDRAW_SERVER_IMAGE_TAG: 32.48.0
8 changes: 4 additions & 4 deletions ansible/host_vars/prod-nbc/version.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.47.2
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.47.0
NUXT_CLIENT_IMAGE_TAG: 32.47.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SHD_CLIENT_IMAGE_TAG: 1.0.1
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.46.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.46.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.16
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.10
TLDRAW_CLIENT_IMAGE_TAG: 1.1.2
TLDRAW_SERVER_IMAGE_TAG: 32.47.0
TLDRAW_SERVER_IMAGE_TAG: 32.48.0
8 changes: 4 additions & 4 deletions ansible/host_vars/prod-thr/version.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.47.2
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.47.0
NUXT_CLIENT_IMAGE_TAG: 32.47.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SHD_CLIENT_IMAGE_TAG: 1.0.1
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.46.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.46.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.16
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.10
TLDRAW_CLIENT_IMAGE_TAG: 1.1.2
TLDRAW_SERVER_IMAGE_TAG: 32.47.0
TLDRAW_SERVER_IMAGE_TAG: 32.48.0
8 changes: 4 additions & 4 deletions ansible/host_vars/ref-audit/version.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.46.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.46.0
NUXT_CLIENT_IMAGE_TAG: 32.46.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SHD_CLIENT_IMAGE_TAG: 1.0.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.46.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.46.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.16
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.9
TLDRAW_CLIENT_IMAGE_TAG: 1.1.1
TLDRAW_SERVER_IMAGE_TAG: 32.46.0
TLDRAW_SERVER_IMAGE_TAG: 32.48.0
8 changes: 4 additions & 4 deletions ansible/host_vars/ref-brb/version.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.47.2
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.47.0
NUXT_CLIENT_IMAGE_TAG: 32.47.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SHD_CLIENT_IMAGE_TAG: 1.0.1
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.46.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.46.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.16
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.10
TLDRAW_CLIENT_IMAGE_TAG: 1.1.2
TLDRAW_SERVER_IMAGE_TAG: 32.47.0
TLDRAW_SERVER_IMAGE_TAG: 32.48.0
8 changes: 4 additions & 4 deletions ansible/host_vars/ref-dbc/version.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.47.2
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.47.0
NUXT_CLIENT_IMAGE_TAG: 32.47.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SHD_CLIENT_IMAGE_TAG: 1.0.1
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.46.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.46.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.16
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.10
TLDRAW_CLIENT_IMAGE_TAG: 1.1.2
TLDRAW_SERVER_IMAGE_TAG: 32.47.0
TLDRAW_SERVER_IMAGE_TAG: 32.48.0
8 changes: 4 additions & 4 deletions ansible/host_vars/ref-nbc/version.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.47.2
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.47.0
NUXT_CLIENT_IMAGE_TAG: 32.47.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SHD_CLIENT_IMAGE_TAG: 1.0.1
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.46.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.46.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.16
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.10
TLDRAW_CLIENT_IMAGE_TAG: 1.1.2
TLDRAW_SERVER_IMAGE_TAG: 32.47.0
TLDRAW_SERVER_IMAGE_TAG: 32.48.0
8 changes: 4 additions & 4 deletions ansible/host_vars/ref-thr/version.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.47.2
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.47.0
NUXT_CLIENT_IMAGE_TAG: 32.47.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SHD_CLIENT_IMAGE_TAG: 1.0.1
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.46.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.46.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.16
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.10
TLDRAW_CLIENT_IMAGE_TAG: 1.1.2
TLDRAW_SERVER_IMAGE_TAG: 32.47.0
TLDRAW_SERVER_IMAGE_TAG: 32.48.0
4 changes: 3 additions & 1 deletion ansible/roles/clammit/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
---
WITH_CLAMMIT: false
WITH_CLAMMIT: false
CLAMMIT_IMAGE_NAME: ghcr.io/dbildungsplattform/clammit
CLAMMIT_IMAGE_TAG: 0.9.1
2 changes: 2 additions & 0 deletions ansible/roles/erwin-idm/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ERWINIDM_IMAGE_NAME: docker.io/schulcloud/erwin-idm
ERWINIDM_IMAGE_TAG: 0.4.8
Loading

0 comments on commit dae2173

Please sign in to comment.