Skip to content

Commit

Permalink
Merge branch 'main' into BC-8472-mongodb-ionos-migration-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
YannickEvers authored Dec 3, 2024
2 parents e93c707 + 20c2c57 commit 2e69f51
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ansible/group_vars/all/instance_config_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 Down
6 changes: 5 additions & 1 deletion 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 @@ -14,3 +14,7 @@ FEATURE_H5P_EDITOR_ENABLED: "true"
BLOCKLIST_OF_EMAIL_DOMAINS: "schul-cloud.org"

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
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

0 comments on commit 2e69f51

Please sign in to comment.