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 11, 2024
2 parents 5f68bb5 + 64b059b commit 96d55e0
Show file tree
Hide file tree
Showing 21 changed files with 142 additions and 148 deletions.
20 changes: 10 additions & 10 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.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
NUXT_CLIENT_IMAGE_TAG: 32.49.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.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.48.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
TLDRAW_SERVER_IMAGE_TAG: 32.49.0
20 changes: 10 additions & 10 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.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
NUXT_CLIENT_IMAGE_TAG: 32.49.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.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.48.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
TLDRAW_SERVER_IMAGE_TAG: 32.49.0
20 changes: 10 additions & 10 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.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
NUXT_CLIENT_IMAGE_TAG: 32.49.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.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.48.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
TLDRAW_SERVER_IMAGE_TAG: 32.49.0
20 changes: 10 additions & 10 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.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
NUXT_CLIENT_IMAGE_TAG: 32.49.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.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.48.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
TLDRAW_SERVER_IMAGE_TAG: 32.49.0
20 changes: 10 additions & 10 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.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
NUXT_CLIENT_IMAGE_TAG: 32.49.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.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.48.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
TLDRAW_SERVER_IMAGE_TAG: 32.49.0
20 changes: 10 additions & 10 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.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
NUXT_CLIENT_IMAGE_TAG: 32.49.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.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.48.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
TLDRAW_SERVER_IMAGE_TAG: 32.49.0
1 change: 1 addition & 0 deletions ansible/host_vars/ref-audit/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ DOMAIN: staging.audit.dbildungscloud.org

FEATURE_OAUTH_LOGIN_ENABLED: "true"
FEATURE_H5P_EDITOR_ENABLED: "true"
FEATURE_ROOMS_ENABLED: "true"

DISPLAY_REQUEST_LEVEL: -1
ALERT_STATUS_URL: https://status.dbildungscloud.dev/
Expand Down
22 changes: 11 additions & 11 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.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.48.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
NUXT_CLIENT_IMAGE_TAG: 32.49.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
SHD_CLIENT_IMAGE_TAG: 1.0.1
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
TLDRAW_SERVER_IMAGE_TAG: 32.49.0
20 changes: 10 additions & 10 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.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
NUXT_CLIENT_IMAGE_TAG: 32.49.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.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.48.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
TLDRAW_SERVER_IMAGE_TAG: 32.49.0
20 changes: 10 additions & 10 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.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
NUXT_CLIENT_IMAGE_TAG: 32.49.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.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.48.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
TLDRAW_SERVER_IMAGE_TAG: 32.49.0
20 changes: 10 additions & 10 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.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
NUXT_CLIENT_IMAGE_TAG: 32.49.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.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.48.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
TLDRAW_SERVER_IMAGE_TAG: 32.49.0
20 changes: 10 additions & 10 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.48.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.48.0
NUXT_CLIENT_IMAGE_TAG: 32.48.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.46.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
NUXT_CLIENT_IMAGE_TAG: 32.49.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.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.48.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
TLDRAW_SERVER_IMAGE_TAG: 32.49.0
1 change: 0 additions & 1 deletion ansible/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
- hydra
- erwin-idm
- oidcmock
- dof_etherpad_nginx
- dof_etherpad
- clamav
- schulcloud-server-core
Expand Down
1 change: 0 additions & 1 deletion ansible/playbook_rollout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
when: KEDA_ENABLED is defined and KEDA_ENABLED|bool
- role: hydra
- role: erwin-idm
- role: dof_etherpad_nginx
- role: dof_etherpad
- role: clamav
- role: schulcloud-server-core
Expand Down
27 changes: 26 additions & 1 deletion ansible/roles/dof_etherpad/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,29 @@
template: deployment.yml.j2
tags:
- deployment


- name: nginx service
kubernetes.core.k8s:
kubeconfig: ~/.kube/config
namespace: "{{ NAMESPACE }}"
template: nginx-svc.yml.j2
tags:
- service

- name: nginx configmap files
kubernetes.core.k8s:
kubeconfig: ~/.kube/config
namespace: "{{ NAMESPACE }}"
template: nginx-configmap-files.yml.j2
apply: yes
tags:
- configmap

- name: nginx deployment
kubernetes.core.k8s:
kubeconfig: ~/.kube/config
namespace: "{{ NAMESPACE }}"
template: nginx-deployment.yml.j2
tags:
- deployment

Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ data:
proxy_buffering off;
}

location /etherpad/stats {
return 404;
}

location / {
root /usr/share/nginx/html;
index index.html index.htm;
Expand Down
9 changes: 0 additions & 9 deletions ansible/roles/dof_etherpad_nginx/meta/main.yml

This file was deleted.

25 changes: 0 additions & 25 deletions ansible/roles/dof_etherpad_nginx/tasks/main.yml

This file was deleted.

0 comments on commit 96d55e0

Please sign in to comment.