Skip to content

Commit

Permalink
Merge branch 'main' into EW-1021
Browse files Browse the repository at this point in the history
  • Loading branch information
mkreuzkam-cap authored Dec 10, 2024
2 parents 293f6bd + 99f8b6f commit 5f68bb5
Show file tree
Hide file tree
Showing 33 changed files with 58 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- run: find -name "*.tar" -exec tar -xf {} \;
- uses: actions/setup-python@v5
with:
python-version: '3.12'
python-version: '3.13'
- name: Install python3-kubernetes
run: sudo apt-get install -y python3-kubernetes
- name: 1Password
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
path: ${{github.workspace }}/${{ inputs.host_name }}.tar
- uses: actions/setup-python@v5
with:
python-version: '3.12'
python-version: '3.13'
- name: Install python3-kubernetes
run: sudo apt-get install -y python3-kubernetes

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install Python 3
uses: actions/setup-python@v5
with:
python-version: 3.12
python-version: 3.13
- name: Install dependencies
run: |
pip install pyyaml
Expand Down
4 changes: 0 additions & 4 deletions ansible/group_vars/all/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,17 +212,14 @@ configuration_all:
nuxtclient: false
# Identity Management
FEATURE_IDENTITY_MANAGEMENT_ENABLED:
value: "{{ FEATURE_IDENTITY_MANAGEMENT_ENABLED }}"
server: true
client: false
nuxtclient: false
FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED:
value: "{{ FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED }}"
server: true
client: false
nuxtclient: false
FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED:
value: "{{ FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED }}"
server: true
client: false
nuxtclient: false
Expand Down Expand Up @@ -833,7 +830,6 @@ configuration_all:
client: true
nuxtclient: true
DASHBOARD_ANNOUNCEMENT_TEXT:
value: "dashboard.text.announcement"
server: true
client: true
nuxtclient: false
Expand Down
10 changes: 6 additions & 4 deletions ansible/group_vars/all/instance_config_all.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# this is the place for all "newer" services that are not based on the api-configmap but which need default values to overwrite them from the values that are supplied from the app
# with other words this is a place for default values across all envs and stages that NEED to be overwritten from app defaults

API_HOST_URI: "http://api-svc:3030"
ROCKET_CHAT_URI: "http://rocketchat-svc:5000"
CALENDAR_URI: "http://calendar-svc:3000"
NEST_LOG_LEVEL: "info"

# Identity Management
FEATURE_IDENTITY_MANAGEMENT_ENABLED: "true"
FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "true"
FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false"
FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED: "false"
IDENTITY_MANAGEMENT__INTERNAL_URI: "http://erwinidm-svc:8089"
IDENTITY_MANAGEMENT__EXTERNAL_URI: "https://{{ ERWINIDM_PREFIX }}{{ DOMAIN }}"
Expand All @@ -24,13 +24,13 @@ FEATURE_MEDIA_SHELF_ENABLED: "true"
# TSP Sync
FEATURE_TSP_SYNC_ENABLED: "false"
TSP_SYNC_SCHOOL_LIMIT: "10"
TSP_SYNC_DATA_LIMIT: "150"
TSP_SYNC_DATA_LIMIT: "50"
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"
FEATURE_TSP_MIGRATION_ENABLED: "false"
TSP_SYNC_MIGRATION_LIMIT: "100"
TSP_SYNC_MIGRATION_LIMIT: "50"

ERWINIDM_PORT: 8089
ERWINIDM_PREFIX: idm.
Expand All @@ -41,3 +41,5 @@ ERWINIDM_ADMIN_INGRESS_CLASS: management
ERWINIDM_ADMIN_CREATE_CERTIFICATE: true
ERWINIDM_ADMIN_TLS_AUTH_SECRET: erwinidm-tls-auth

TLDRAW_LOG_LEVEL: "info"
FEATURE_TLDRAW_ENABLED: "true"
3 changes: 0 additions & 3 deletions ansible/group_vars/develop/dof_mailcatcher.yml

This file was deleted.

2 changes: 2 additions & 0 deletions ansible/group_vars/develop/external-secrets.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
EXTERNAL_SECRETS_OPERATOR: true
EXTERNAL_SECRETS_POSTFIX: "-source"
2 changes: 1 addition & 1 deletion ansible/group_vars/develop/with.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WITH_MONGO_DATABASES: true
WITH_BRANCH_MONGO_DB_MANAGEMENT: true
WITH_BRANCH_POSTGRES_DB_MANAGEMENT: true
WITH_SCHULCLOUD_INIT: true
WITH_CALENDAR_INIT: true
Expand Down
3 changes: 0 additions & 3 deletions ansible/group_vars/infra/dof_mailcatcher.yml

This file was deleted.

3 changes: 0 additions & 3 deletions ansible/group_vars/loadtest/dof_mailcatcher.yml

This file was deleted.

12 changes: 12 additions & 0 deletions ansible/group_vars/production/resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ HYDRA_CPU_MAX: "1000m"
HYDRA_CPU_MIN: "100m"
HYDRA_MEM_MAX: "1Gi"
HYDRA_MEM_MIN: "1Gi"
H5P_PROXY_CPU_LIMITS: "1000m"
H5P_PROXY_CPU_REQUESTS: "100m"
H5P_PROXY_MEMORY_LIMITS: "1Gi"
H5P_PROXY_MEMORY_REQUESTS: "1Gi"
LIBREOFFICE_CPU_MAX: "4000m"
LIBREOFFICE_CPU_MIN: "200m"
LIBREOFFICE_MEM_MAX: "10Gi"
Expand Down Expand Up @@ -123,3 +127,11 @@ COMMON_CARTRIDGE_CPU_LIMITS: "1000m"
COMMON_CARTRIDGE_MEMORY_LIMITS: "2Gi"
COMMON_CARTRIDGE_CPU_REQUESTS: "100m"
COMMON_CARTRIDGE_MEMORY_REQUESTS: "2Gi"
TLDRAW_SERVER_CPU_LIMITS: "2000m"
TLDRAW_SERVER_CPU_REQUESTS: "100m"
TLDRAW_SERVER_MEMORY_LIMITS: "2Gi"
TLDRAW_SERVER_MEMORY_REQUESTS: "2Gi"
TLDRAW_SERVER_WORKER_CPU_LIMITS: "2000m"
TLDRAW_SERVER_WORKER_CPU_REQUESTS: "100m"
TLDRAW_SERVER_WORKER_MEMORY_LIMITS,: "2Gi"
TLDRAW_SERVER_WORKER_MEMORY_REQUESTS,: "2Gi"
2 changes: 1 addition & 1 deletion ansible/group_vars/reference/mongodb_query_exporter.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mongodb_query_exporter_mongodb_sc_db_name: "staging_{{ mongodb_query_exporter_mongodb_sc_db_tenant }}"
mongodb_query_exporter_mongodb_sc_db_name: "{{ NAMESPACE }}_schulcloud"
12 changes: 12 additions & 0 deletions ansible/group_vars/reference/resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ ETHERPA_NGINX_CPU_LIMITS: "1000m"
ETHERPA_NGINX_CPU_REQUESTS: "100m"
ETHERPA_NGINX_MEMORY_LIMITS: "1Gi"
ETHERPA_NGINX_MEMORY_REQUESTS: "1Gi"
H5P_PROXY_CPU_LIMITS: "1000m"
H5P_PROXY_CPU_REQUESTS: "100m"
H5P_PROXY_MEMORY_LIMITS: "1Gi"
H5P_PROXY_MEMORY_REQUESTS: "1Gi"
HYDRA_CPU_MAX: "1000m"
HYDRA_CPU_MIN: "100m"
HYDRA_MEM_MAX: "1Gi"
Expand Down Expand Up @@ -123,3 +127,11 @@ COMMON_CARTRIDGE_CPU_LIMITS: "1000m"
COMMON_CARTRIDGE_MEMORY_LIMITS: "2Gi"
COMMON_CARTRIDGE_CPU_REQUESTS: "100m"
COMMON_CARTRIDGE_MEMORY_REQUESTS: "2Gi"
TLDRAW_SERVER_CPU_LIMITS: "2000m"
TLDRAW_SERVER_CPU_REQUESTS: "100m"
TLDRAW_SERVER_MEMORY_LIMITS: "2Gi"
TLDRAW_SERVER_MEMORY_REQUESTS: "2Gi"
TLDRAW_SERVER_WORKER_CPU_LIMITS: "2000m"
TLDRAW_SERVER_WORKER_CPU_REQUESTS: "100m"
TLDRAW_SERVER_WORKER_MEMORY_LIMITS,: "2Gi"
TLDRAW_SERVER_WORKER_MEMORY_REQUESTS,: "2Gi"
1 change: 0 additions & 1 deletion ansible/host_vars/dbc_host/cfg.yml
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED: "true"
1 change: 0 additions & 1 deletion ansible/host_vars/prod-brb/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ BETTERMARKS_APPS_URL: "https://apps.bettermarks.brandenburg.cloud"
BETTERMARKS_SCHOOL_URL: "https://school.bettermarks.brandenburg.cloud"
HYDRA_ISSUER_URL_SUFFIX: "/"

FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false"
JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAm08zACg11BAVpe9JYtjG0LTGtFxPfGdTue3qo7WFtbW15mkjoRMA\nvcjpmuidnOJdDjYyJjyFG8nvQb/pMqZ9eUOc187SH987WumGeByGeQZUnf5rzgiM\nq7VAQfybQgP+eUgojhf/eNLRwASuD1crC4YbZKXef33d/H2nYsPhRQnWOqs0GxGS\noX2lyELLAh44N5UiOeCD/hoCkXMCRrXKJh5W0vRifThtea4j+FMSqmXsoa/+0KBc\ntVIifII5flo7IFIePf5NYARDMwm+0EQU9r589TO+2jYOlutPHEsL084Wpha+vpmN\nV3cFptQDxMBEagkMPrPSlmJeTkEYJzrMNNnhZ+49+lz0YYgALotUfYeR7RhEnAq8\nywSTEfLvtG6IzoYe1PCDRR6+PWTrw8C5Ly5mKg73NQYNO5vKmpXF0t9YYnSPr4Oi\n8EHXHGaRqOqQ2hVa8kPgi0Gi8YqsCYPMXOr6dKJOCoNd7eokFXrLWNyO9+idAuZw\nFt46fPAlRJnCQz88+WMmyVaMaTlhEw7dtdIECN95uvjfo8OVOEI3C3ArI4NWq8ze\nDVFP72YV3zTYvVnz8qklONAcVmncnkhrDXONLhPb1wOJ4gjWDKatPPiIffswZ4c+\n3ujccNkOzKdttUjFushaEdfwYYplh31j7HtjNggtdx0eEJllwOF0xcsCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n'
1 change: 0 additions & 1 deletion ansible/host_vars/prod-dbc/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ DOMAIN: dbildungscloud.de
ROCKETCHAT_DNS_PREFIX: scchat.

ALERT_STATUS_URL: "https://status.dbildungscloud.de"
FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false"
JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAuShjUboB+Qq9KPjJxLRKLSqPe+5k/368vMHvMANmtYOG+BTZnfQb\nVu0gy1xAny/KeiyKefj0ALur//4kZIhEg1K6D/kV7gT1DLsinpOnAd55YEg/CzuF\nOdnGn5mt13mXU7ZXXTOaAgqRJsO4ClKGO9LVzPK5CRPMlmMrMB/ODciqDWkJQZ9Z\neZd4Q+ffO6LLJFcyUM0huytsCXZww6WAgota7fADw0ZHqUAoINtUn+WmxbvpMr8M\nj5AtVgTXwt1BqBGSYRFNBCBzSWx3yY04tXgEUozzSG0GBWQ6dR2mlonjvf+750oB\n7wfGeLUM0e1KQ/D4PqjpgisQYptQbp9YHw1hS9YkKDe+mDpGTKk/MaByIyFuC0D6\n71TsSbJjpPsgrDyROBgGGHkO6//6bNjmwHzDbOtdAOUr4o9qB5SLKgS8QdIfSXxX\ncDB8Yp+Nu2BDKb3mHyhna6TH5/vucGRfxIaI4WIiIrpKTm/Opc9UhduRvI24KSYe\nV4rnfJ8q+5SRTfphpRiPBZdAbp1EyIZAhuU7w0yvS1jQXQt9Sbpq7zIxaooLaCmP\ngQ0djOOCLErZbCGFuAFO9CwLWFakV65naOzHxkSoUr/+IbXGwRKl7cN2sbJLlZc0\nsclGTyy9H4ibmwVvnm1Nw377lZPFmd4TP3lL1piR6lgH4ftup/r4xRECAwEAAQ==\n-----END RSA PUBLIC KEY-----\n'
2 changes: 0 additions & 2 deletions ansible/host_vars/prod-nbc/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ ALERT_STATUS_URL: https://status.niedersachsen.cloud/
NEXTCLOUD_REDIRECT_URL: https://nextcloud.niedersachsen.cloud/apps/files/?dir=/
NEXTCLOUD_BASE_URL: https://nextcloud.niedersachsen.cloud

FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false"

# Migration wizard
FEATURE_USER_MIGRATION_SYSTEM_ID: "646df8f63bcc1a27c52af131"

Expand Down
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 @@ -15,5 +15,4 @@ NEXTCLOUD_BASE_URL: https://nextcloud.schulcloud-thueringen.de

BLOCKLIST_OF_EMAIL_DOMAINS: "schul-cloud.org"

FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false"
JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAsAJYGUDM4mApwx+ApjzjK03qTHwUEUNLe4xNj1B0I+K36oJx3jAS\njN8TZqDoIAvIuK6eXIZP3AcxmbphFUmzS8z/9i5tBdf1UXsf1alqaQSmaEEKalXL\npZSH2m53NmVs4mu5uVCKGhlnkOd0/jIuEfuO3Q00YtFlaYglIMqagU1fD+zXgqdI\nwGWWxcIju1960aGo7CqMFTrE+STMowBNH5T/OUn+NWhs94gJWzFM356EehS5LKjI\nkRpXmPI7Utj4x1vMXtDm1VJZ9U0CvUzeTOnAjitjyV8xJV+Muubs6QM1OIBWfPoY\n13364ZkfSsBpRH+uOImNv1mj+/AqFuEyucc52XLI6D4tfZKvEQR/qXUiJTPdgZE0\n8sAkwiEE5Y34h/MJq5/N1AuW5OUMVKqpv4tkXkGL3KHG5A3dwAFV/5inTVr1xdG1\nVx0vdne6Jv4/AejLdey+FoBd90RSYYZgecBvbbM4eq4pTqQMZvAwC/DsDDismibn\nufxYQ0GsZ0qFG//VVMHjHIW26yOuoga52o4El84VJTzdxTv2rDkgM4BvpRtqm+w/\n7jOyvgoHha6HS9nRFcfbV6g7EYjaGk96V5MicIeVzFYV8Yrrb9iBnhiT1gQex+JR\nazwKtqtPFgExtFVx364sVA2bXqgm9pM/TFgQ9Qe+h4GuO+5y+HqbuyUCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n'
2 changes: 2 additions & 0 deletions ansible/host_vars/ref-audit/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ NAMESPACE: audit
DOMAIN: staging.audit.dbildungscloud.org

FEATURE_OAUTH_LOGIN_ENABLED: "true"
FEATURE_H5P_EDITOR_ENABLED: "true"

DISPLAY_REQUEST_LEVEL: -1
ALERT_STATUS_URL: https://status.dbildungscloud.dev/
JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAsP0jl8e349AgtLhQPOrp6ciCw9R5B04fcvuyJuMnZbFnv1pyYAuu\ndkyyLRh7xfwm+hxVzbCytJK627iHBZn4ZnbDbn0xWrf01qdyEQYZTrZekPRZtGUa\nl54w5TaZyLHCgQzvgs2x//RKWGEOys6xUT8HX/04FByw50uIElUjmJtUWq2NiYZs\nDQeqoEcQFgLBnDQkU2WUF/ZVg7tA0btNsF8fadkt2lD6pLnsGRvYYDwfV0FXvh82\nHcLnEbXml9ALQdHH8Cq/gKdb1cIjD2qFKZOhtkAiiHyrHouNmBiKOZd1yXBykiuf\nQ3evJwTb4pLyhaJf8G7X0gRkFECjT96765KLsQHFjrmW6TAVfF/HfzcAgpjFiMHc\naFsPf9pUSWSeZI1kBjnPH9qmjXjCVFsBTWt4BZ3nvMTrz4Qmi42Ajdy5VgkZ5/ZL\nSbyaEYWEGJsjolQ3Nf6r8j4YgQqJLquNowxN0M+AjDeNWn+5Do6rx2HQYeLnOwJe\nSE3ihH/P5UZyyJ2no4GFKnYUm+U5ky6tLrXG7Zg1SdFNKrOWaM+WUWJqALme4iC7\nPEk8skkuhlXzJmGdD0sx4DLX1RcM/REl34h87h4fsEpU/enMs0QooibDXBoR3ioO\nEuEodlq4pTeTGMGhdrvOgoZCCJEQGcrAgAKvxTxxjHbAMlNUIIU1W28CAwEAAQ==\n-----END RSA PUBLIC KEY-----\n'
1 change: 0 additions & 1 deletion ansible/host_vars/ref-audit/mongodb_query_exporter.yaml

This file was deleted.

3 changes: 3 additions & 0 deletions ansible/host_vars/ref-audit/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ TLDRAW_CLIENT_REPLICAS: 2
TLDRAW_SERVER_REPLICAS: 2
ADMIN_API_SERVER_REPLICAS: 1
BOARD_COLLABORATION_SERVER_REPLICAS: 3
API_H5P_EDITOR_REPLICAS: 1
API_H5P_LIBRARY_MANAGEMENT_REPLICAS: 1
H5P_PROXY_REPLICAS: 1
1 change: 1 addition & 0 deletions ansible/host_vars/ref-audit/with.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
WITH_STORAGE: true
WITH_LDAP: true
WITH_H5P_EDITOR: true
1 change: 0 additions & 1 deletion ansible/host_vars/ref-brb/mongodb_query_exporter.yaml

This file was deleted.

1 change: 0 additions & 1 deletion ansible/host_vars/ref-dbc/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ DOMAIN: staging.dbildungscloud.org

DISPLAY_REQUEST_LEVEL: -1
ALERT_STATUS_URL: https://status.dbildungscloud.de/
FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED: "true"
JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAzmY2P+LW1ImBVKLsqnP8Xiel7agXL94W76Xeo7JfeCBZzKGHzMJH\n0F4SnpqXoWADQ3spoWohgr/suR604Zo63oBb6c5nIqt+KNZdOtkCEOb9clYtI0CE\nLUqtRXtaVPDaGjK4+1R5oZiDZ2zUsBhTXp0FqCpN7dQeWbM1J8X+CWxEdMT8kaGu\nMjpWLIoB+JYWu8U5zc1nNU4VYoeMWRPNBbnj832ZpnZ+LMIF9HxlyAR2uevyMwGj\nDhL8AJfyiq42p89ksEiLZ3y/KLX6WKKP2JfDulAotqv5CYjR0wvsZgT8vr2cnQ80\nhaTv8aApJ7xZ4ElhuAe6SOq6cWr/x8uQZQFqH6GXQne2EBx2OVtMo8yXmwKTX2Ws\n0RxPF3zNnaFL7yb07jt1R4vhXbdIecOY4BQLx4ICiaezqtqJEDiZz9varJ/MQTyl\njfx1DTFkG0Q3Ce34mz6/N+fEoykE8uyqioK41trf/Zipm0Fwjq73mMGMdKauWTz/\n5Dzjh09JRYyRTS3D2K0X9FLkjMeIr953NNYG9XX4vMUiysLdFHN7NA8TaDcuSXSe\n/SXPfnyhgU5SDUBMYVOhW3otBWM/B41O634x7geU/RCKWThiHqrfXoFPGvvMJQO8\nuEJ0rgcZyS0WOcruLm8EuZqaMb7rR5t5EXv4Mlu9YA3XuwyrM8H7lu0CAwEAAQ==\n-----END RSA PUBLIC KEY-----\n'
1 change: 0 additions & 1 deletion ansible/host_vars/ref-dbc/mongodb_query_exporter.yaml

This file was deleted.

1 change: 0 additions & 1 deletion ansible/host_vars/ref-nbc/mongodb_query_exporter.yaml

This file was deleted.

7 changes: 5 additions & 2 deletions ansible/host_vars/ref-thr/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ NAMESPACE: thueringen
DOMAIN: test.schulcloud-thueringen.de

ALERT_STATUS_URL: https://status.schulcloud-thueringen.de/
NOT_AUTHENTICATED_REDIRECT_URL: https://test.schulportal-thueringen.de/cas/login?service=https://test.schulcloud-thueringen.de/tsp-login
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

Expand All @@ -13,5 +13,8 @@ FEATURE_H5P_EDITOR_ENABLED: "true"

BLOCKLIST_OF_EMAIL_DOMAINS: "schul-cloud.org"

FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false"
JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAsMKXe1sn5Ifc0wxEdsmKYkhMkMoo4HYOZu4rdXahPCcBmIa5AN2u\nHO1q2+gtLFqT/iT8/dUTZrorrEEZq6+flGDwZC9IEkNv1Cahdg+6vAr3X/8zFUdn\nW/R04REeFS0T59YuoGJs8k7CbrjDqlwqzjIggHUrV2JGDLsGOl/2Z4JjeajSAGBH\njor5YRTD9TlO5eLSermzksH2OnC/IiP96UKb4dTdzRLtTPBC3mxxx8+sSGSRiCma\n4ebN36E9ErzXaDUdzJ++7UJ/gZtY3LhBKav6F/G0025Er8OSRe6r7WnDgFb+JevL\nzWQ+DSNeaAsn8X4qhQ1u7qq7kDwOam+EmeCQbxrv1CbC+wWRv6Ik1XHo7Wjk6vsT\n1E+stdIO8OAiCL0KfdkmesvxIoGL94YdFr4QWZ0bApH/MLijQyl3fu9moBsT8/iu\n1QTRaDTk1AbmUc7FHtziuE1+lVn9Qetjwm5ANGr022QuhmOa0HhaqAfXL8hXEoca\nNnFmeB9C2mjweN6xHkyY3nOB6InzLf1ju7+k548pt6pl8UbbRApdYbo/KyMC/Ma5\nmKrL2P/LC1bsssQh/AXaMM2x1GcmFDaEE00gD3s4acgeLtMZxy+g2eD90FyKgDCb\nyoKagcmbGT8TI6ExNjuhwAnJdd0O5xwSCso50W/giIuIFm1XcHwvHQUCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n'

FEATURE_TSP_SYNC_ENABLED: "true"
FEATURE_TSP_MIGRATION_ENABLED: "true"
TSP_API_CLIENT_BASE_URL: https://test.schulportal-thueringen.de/tip-ms/api
1 change: 0 additions & 1 deletion ansible/host_vars/ref-thr/mongodb_query_exporter.yaml

This file was deleted.

4 changes: 3 additions & 1 deletion ansible/host_vars/ref-thr/with.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
WITH_STORAGE: true
WITH_H5P_LIBRARY_MANAGEMENT: true
WITH_H5P_EDITOR: true
WITH_H5P_EDITOR: true
WITH_TSP_SYNC: true
WITH_TSP: false
5 changes: 0 additions & 5 deletions ansible/host_vars/thr_host/shared_mongodb.yml

This file was deleted.

4 changes: 4 additions & 0 deletions ansible/roles/dof_mailcatcher/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
MAILCATCHER_IMAGE_NAME: docker.io/sj26/mailcatcher
# alpha releases also come in latest!
MAILCATCHER_IMAGE_TAG: v0.10.0
2 changes: 1 addition & 1 deletion ansible/roles/maildrop/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
MAILDROP_IMAGE_NAME: ghcr.io/kaffeekrone/mail-drop
MAILDROP_IMAGE_TAG: 2.0
MAILDROP_IMAGE_TAG: 2.1
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ deployments_for_scaled_objects:
- name: board-collaboration-deployment
- name: common-cartridge-deployment
- name: clammit-deployment
# those 2 will be re-added when new tldraw stuff is enabled by default
# - tldraw-deployment
# - tldraw-worker-deployment
- name: tldraw-server-deployment
- name: tldraw-worker-deployment
- name: tldraw-client-deployment
- name: valkey-node
kind: StatefulSet
Expand Down

0 comments on commit 5f68bb5

Please sign in to comment.