Skip to content

Commit

Permalink
N21-2103 add media license role for vidis sync (#1043)
Browse files Browse the repository at this point in the history
  • Loading branch information
sdinkov authored Jan 13, 2025
1 parent 4b560c4 commit fab6d0a
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 1 deletion.
13 changes: 13 additions & 0 deletions ansible/group_vars/all/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1123,3 +1123,16 @@ configuration_all:
server: true
client: true
nuxtclient: false
VIDIS_API_CLIENT_BASE_URL:
server: true
client: false
nuxtclient: false
VIDIS_SYNC_REGION:
server: true
client: false
nuxtclient: false
FEATURE_VIDIS_MEDIA_ACTIVATIONS_ENABLED:
value: "false"
server: true
client: false
nuxtclient: false
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_BOARD_COLLABORATION: false
WITH_MIGRATION_SYSTEMS: false
WITH_COMMON_CARTRIDGE: false
WITH_CLAMMIT: false
WITH_MEDIA_LICENSES: false
1 change: 1 addition & 0 deletions ansible/group_vars/develop/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ SERVER_TSP_SYNC_CRONJOB_SCHEDULE: "{{ SERVER_TSP_RANDOM|int + 9 }} 20 * * *"
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 * * * *"
SERVER_VIDIS_SYNC_CRONJOB_SCHEDULE: "{{ 20 | random(seed=NAMESPACE) }} 4 * * *"

# 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'
7 changes: 6 additions & 1 deletion ansible/group_vars/nbc/instance_cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SC_TITLE: Niedersächsische Bildungscloud
SC_PRODUCTNAME: Niedersächsische Bildungscloud
SC_NAV_TITLE: Niedersächsische Bildungscloud
SC_CONTACT_EMAIL: [email protected]
GLOBAL_ANNOUNCEMENT_TEXT: ''
GLOBAL_ANNOUNCEMENT_TEXT: ""
GLOBAL_ANNOUNCEMENT_ROLES: teacher,administrator
TRAINING_URL: "https://openelec.moodle-nds.de/course/index.php?categoryid=53"

Expand Down Expand Up @@ -51,6 +51,7 @@ FEATURE_OTHER_GROUPUSERS_PROVISIONING_ENABLED: "true"
FEATURE_SCHULCONNEX_MEDIA_LICENSE_ENABLED: "true"
FEATURE_PREFERRED_CTL_TOOLS_ENABLED: "true"
FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: "true"
FEATURE_VIDIS_MEDIA_ACTIVATIONS_ENABLED: "true"

TEACHER_STUDENT_VISIBILITY__IS_ENABLED_BY_DEFAULT: "false"
TEACHER_STUDENT_VISIBILITY__IS_CONFIGURABLE: "true"
Expand Down Expand Up @@ -122,6 +123,10 @@ SCHULCONNEX_CLIENT__TOKEN_ENDPOINT: "https://auth.stage.niedersachsen-login.schu

PROVISIONING_SCHULCONNEX_POLICIES_INFO_URL: "https://api-dienste.stage.niedersachsen-login.schule/v1/policies-info"

# VIDIS
VIDIS_API_CLIENT_BASE_URL: "https://service-stage.vidis.schule/o/vidis-rest"
VIDIS_SYNC_REGION: "test-region"

# Ingress
group_ingress:
api_v1_roster:
Expand Down
4 changes: 4 additions & 0 deletions ansible/group_vars/production/resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,7 @@ TLDRAW_SERVER_WORKER_CPU_LIMITS: "2000m"
TLDRAW_SERVER_WORKER_CPU_REQUESTS: "100m"
TLDRAW_SERVER_WORKER_MEMORY_LIMITS,: "2Gi"
TLDRAW_SERVER_WORKER_MEMORY_REQUESTS,: "2Gi"
MEDIA_ACTIVATION_CPU_LIMITS: "2000m"
MEDIA_ACTIVATION_CPU_REQUESTS: "100m"
MEDIA_ACTIVATION_MEMORY_LIMITS: "2Gi"
MEDIA_ACTIVATION_MEMORY_REQUESTS: "2Gi"
4 changes: 4 additions & 0 deletions ansible/group_vars/reference/resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,7 @@ TLDRAW_SERVER_WORKER_CPU_LIMITS: "2000m"
TLDRAW_SERVER_WORKER_CPU_REQUESTS: "100m"
TLDRAW_SERVER_WORKER_MEMORY_LIMITS,: "2Gi"
TLDRAW_SERVER_WORKER_MEMORY_REQUESTS,: "2Gi"
MEDIA_ACTIVATION_CPU_LIMITS: "2000m"
MEDIA_ACTIVATION_CPU_REQUESTS: "100m"
MEDIA_ACTIVATION_MEMORY_LIMITS: "2Gi"
MEDIA_ACTIVATION_MEMORY_REQUESTS: "2Gi"
2 changes: 2 additions & 0 deletions ansible/host_vars/nbc_host/with.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Media License (VIDIS)
WITH_MEDIA_LICENSES: true
1 change: 1 addition & 0 deletions ansible/host_vars/prod-nbc/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ PROVISIONING_SCHULCONNEX_POLICIES_INFO_URL: "https://api-dienste.moin.schule/v1/

JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAx3s+uLFUG4TSEvXvPu8Kb9UqX5VKIlBjFggoprxbtDShykL+O+lY\nZNG2XJoZ1OCwsGify617OOr/+3XmPChXbDTiuAZAZv945zhZ6ebtkAkKvAzf1jU+\n0ZoidcrpjebCn5oZyZqLJm1uNRxlFkKKJSactc7DTT99NB/AP7CPBum6k5QG+XcB\nsn9KMzPB4jx2PFoMwDU7vOUbHqPrj+0n3lW8/xMcgwVqoWFE11C8oDSSZNcByATf\n8AfX4lfREmtj0HAD6KSXEiT+OM53KWhq7Sz8icE+eiq8oLka2T6kI7gP1N2+9ycq\nh+CtS30ABvQi1Z6meCOjPk8HOFFa3Vj5o2pnrx6cXng4EQL59Y4NzhOclkxOUrUm\nAzWT51g1EdfjTh4PYNCQNJdbfcHL8/H3y8Khg6YCE/6qU7lFyt2aLOriy0d7fTCP\nCA0eQPE71PtYmncW/vk9SCHfQG3Xri3si3MkRQyshYwKBEBIc0Is5owsByAyqxwU\n0NIv1bo7aSHSTt5Q5WYu9wku7YPRpfYprJs5GjlZUMRD++CHSdQz83pi331EsAyd\nPEccVP7tT3+cHlyF/5+qV5QIZ1da4c+ODydbsyYwpjQh9SReAQtZDkW6l/OcT3cp\n9zXc7mK1dgHMlgkHMR1D8qCCOj0CmFNdjlCQSbV0hXOeowBY8EGPBkkCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n'
FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: "false"
FEATURE_VIDIS_MEDIA_ACTIVATIONS_ENABLED: "false"
1 change: 1 addition & 0 deletions ansible/host_vars/ref-nbc/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ FEATURE_USER_MIGRATION_SYSTEM_ID: "62dab6401c473a01956a0d7d"

JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAuOzRE8DED9QaLtlnMUSNsz6ulucjKBpHfyGr8RAfowP9NtEaOVCv\nnWL2guKUY1rbl1mJMa56bJ+ZYvCUgYdLbRERpDK5mZtaEQ5SoNZ2qYWTEB58Dvm7\nR8OQZ2m3Hv6BZuiBSqWexl7Ns869yBAeE3842Frkm7wjnVG5cc7kp4H0oXTgGQ3d\n8lDswj8VL7h1w1NEDxd2+6IHE0MNnrvo3vcyLG5r3PNYLQZIRGlU0d5xNCUx+ewn\nVBlBaOfJ3cTp+Kl5Q7NBqttya0+YdmpZmcwk20GT89UhCt5EC7G1YyOcwtBcRvBx\nu52A5Q2C2dUZdy48M4Brhtbw8WpFuk54YUbdq0LtO6GCg79XkhSaBAYMKPAYiwWT\np53B+cWiCEKPdX5X7UoE2GVA1ycMRxarpUjz386ckvOd+bMSWdf/41EeGBXhlaDQ\ndLfh/NVR2XJw7TVuxwgUP1qXNQHCG+oEM6LifhouVVESjyweL81w/ayBS0aiY85Q\nYnypmAxh44NrPRHRK56dnJjhqvVA9nSKi3r2EloHu61rQ1pFMy5G30w0xIa0I9Hy\n4DEGntdntEKwXZjtURdmfSZJdQh9pV6FO7UHioMTSbU3290/MaHeNm7SnmeSjodT\nVhSE9O8mXgpiofQAfj9ebv9VKLo55mDh+f/wVzSLRgxgsyKHMnKTBGMCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n'
FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: "false"
FEATURE_VIDIS_MEDIA_ACTIVATIONS_ENABLED: "false"
1 change: 1 addition & 0 deletions ansible/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@
- ingress
- post_deployment
- moin-schule-sync
- media-licenses
1 change: 1 addition & 0 deletions ansible/playbook_rollout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,4 @@
- role: post_deployment
- role: moin-schule-sync
when: WITH_MOIN_SCHULE is defined and WITH_MOIN_SCHULE|bool
- role: media-licenses

0 comments on commit fab6d0a

Please sign in to comment.