diff --git a/ansible/host_vars/dev-loadtest-01/version.yml b/ansible/host_vars/dev-loadtest-01/version.yml index 59bc34772..2a3aa5c6a 100644 --- a/ansible/host_vars/dev-loadtest-01/version.yml +++ b/ansible/host_vars/dev-loadtest-01/version.yml @@ -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 diff --git a/ansible/host_vars/infra.dbildungscloud-01/version.yml b/ansible/host_vars/infra.dbildungscloud-01/version.yml index 59bc34772..2a3aa5c6a 100644 --- a/ansible/host_vars/infra.dbildungscloud-01/version.yml +++ b/ansible/host_vars/infra.dbildungscloud-01/version.yml @@ -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 diff --git a/ansible/host_vars/prod-brb/version.yml b/ansible/host_vars/prod-brb/version.yml index 59bc34772..2a3aa5c6a 100644 --- a/ansible/host_vars/prod-brb/version.yml +++ b/ansible/host_vars/prod-brb/version.yml @@ -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 diff --git a/ansible/host_vars/prod-dbc/version.yml b/ansible/host_vars/prod-dbc/version.yml index 59bc34772..2a3aa5c6a 100644 --- a/ansible/host_vars/prod-dbc/version.yml +++ b/ansible/host_vars/prod-dbc/version.yml @@ -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 diff --git a/ansible/host_vars/prod-nbc/version.yml b/ansible/host_vars/prod-nbc/version.yml index 59bc34772..2a3aa5c6a 100644 --- a/ansible/host_vars/prod-nbc/version.yml +++ b/ansible/host_vars/prod-nbc/version.yml @@ -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 diff --git a/ansible/host_vars/prod-thr/version.yml b/ansible/host_vars/prod-thr/version.yml index 59bc34772..2a3aa5c6a 100644 --- a/ansible/host_vars/prod-thr/version.yml +++ b/ansible/host_vars/prod-thr/version.yml @@ -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 diff --git a/ansible/host_vars/ref-audit/cfg.yml b/ansible/host_vars/ref-audit/cfg.yml index 3ed9dfe44..2f700034b 100644 --- a/ansible/host_vars/ref-audit/cfg.yml +++ b/ansible/host_vars/ref-audit/cfg.yml @@ -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/ diff --git a/ansible/host_vars/ref-audit/version.yml b/ansible/host_vars/ref-audit/version.yml index 12d9208a0..2a3aa5c6a 100644 --- a/ansible/host_vars/ref-audit/version.yml +++ b/ansible/host_vars/ref-audit/version.yml @@ -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 diff --git a/ansible/host_vars/ref-brb/version.yml b/ansible/host_vars/ref-brb/version.yml index 59bc34772..2a3aa5c6a 100644 --- a/ansible/host_vars/ref-brb/version.yml +++ b/ansible/host_vars/ref-brb/version.yml @@ -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 diff --git a/ansible/host_vars/ref-dbc/version.yml b/ansible/host_vars/ref-dbc/version.yml index 59bc34772..2a3aa5c6a 100644 --- a/ansible/host_vars/ref-dbc/version.yml +++ b/ansible/host_vars/ref-dbc/version.yml @@ -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 diff --git a/ansible/host_vars/ref-nbc/version.yml b/ansible/host_vars/ref-nbc/version.yml index 59bc34772..2a3aa5c6a 100644 --- a/ansible/host_vars/ref-nbc/version.yml +++ b/ansible/host_vars/ref-nbc/version.yml @@ -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 diff --git a/ansible/host_vars/ref-thr/version.yml b/ansible/host_vars/ref-thr/version.yml index 59bc34772..2a3aa5c6a 100644 --- a/ansible/host_vars/ref-thr/version.yml +++ b/ansible/host_vars/ref-thr/version.yml @@ -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 diff --git a/ansible/playbook.yml b/ansible/playbook.yml index ad74f37f1..ec41b3e33 100644 --- a/ansible/playbook.yml +++ b/ansible/playbook.yml @@ -22,7 +22,6 @@ - hydra - erwin-idm - oidcmock - - dof_etherpad_nginx - dof_etherpad - clamav - schulcloud-server-core diff --git a/ansible/playbook_rollout.yml b/ansible/playbook_rollout.yml index ce2f7b11b..a20da2111 100644 --- a/ansible/playbook_rollout.yml +++ b/ansible/playbook_rollout.yml @@ -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 diff --git a/ansible/roles/dof_etherpad_nginx/defaults/main.yml b/ansible/roles/dof_etherpad/defaults/main.yml similarity index 100% rename from ansible/roles/dof_etherpad_nginx/defaults/main.yml rename to ansible/roles/dof_etherpad/defaults/main.yml diff --git a/ansible/roles/dof_etherpad/tasks/main.yml b/ansible/roles/dof_etherpad/tasks/main.yml index 82c45ace7..47c53282c 100644 --- a/ansible/roles/dof_etherpad/tasks/main.yml +++ b/ansible/roles/dof_etherpad/tasks/main.yml @@ -41,4 +41,29 @@ template: deployment.yml.j2 tags: - deployment - \ No newline at end of file + + - 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 + diff --git a/ansible/roles/dof_etherpad_nginx/templates/configmap-files.yml.j2 b/ansible/roles/dof_etherpad/templates/nginx-configmap-files.yml.j2 similarity index 97% rename from ansible/roles/dof_etherpad_nginx/templates/configmap-files.yml.j2 rename to ansible/roles/dof_etherpad/templates/nginx-configmap-files.yml.j2 index baee99513..0cd72f438 100644 --- a/ansible/roles/dof_etherpad_nginx/templates/configmap-files.yml.j2 +++ b/ansible/roles/dof_etherpad/templates/nginx-configmap-files.yml.j2 @@ -47,6 +47,10 @@ data: proxy_buffering off; } + location /etherpad/stats { + return 404; + } + location / { root /usr/share/nginx/html; index index.html index.htm; diff --git a/ansible/roles/dof_etherpad_nginx/templates/deployment.yml.j2 b/ansible/roles/dof_etherpad/templates/nginx-deployment.yml.j2 similarity index 100% rename from ansible/roles/dof_etherpad_nginx/templates/deployment.yml.j2 rename to ansible/roles/dof_etherpad/templates/nginx-deployment.yml.j2 diff --git a/ansible/roles/dof_etherpad_nginx/templates/svc.yml.j2 b/ansible/roles/dof_etherpad/templates/nginx-svc.yml.j2 similarity index 100% rename from ansible/roles/dof_etherpad_nginx/templates/svc.yml.j2 rename to ansible/roles/dof_etherpad/templates/nginx-svc.yml.j2 diff --git a/ansible/roles/dof_etherpad_nginx/meta/main.yml b/ansible/roles/dof_etherpad_nginx/meta/main.yml deleted file mode 100644 index f2f2b374e..000000000 --- a/ansible/roles/dof_etherpad_nginx/meta/main.yml +++ /dev/null @@ -1,9 +0,0 @@ -galaxy_info: - role_name: dof_etherpad_nginx - author: Schul-Cloud Verbund - description: role for the dof_etherpad_nginx - company: Schul-Cloud Verbund - license: license (AGPLv3) - min_ansible_version: 2.8 - galaxy_tags: [] -dependencies: [] diff --git a/ansible/roles/dof_etherpad_nginx/tasks/main.yml b/ansible/roles/dof_etherpad_nginx/tasks/main.yml deleted file mode 100644 index a15378e74..000000000 --- a/ansible/roles/dof_etherpad_nginx/tasks/main.yml +++ /dev/null @@ -1,25 +0,0 @@ - - name: Service - kubernetes.core.k8s: - kubeconfig: ~/.kube/config - namespace: "{{ NAMESPACE }}" - template: svc.yml.j2 - tags: - - service - - - name: Configmap Files - kubernetes.core.k8s: - kubeconfig: ~/.kube/config - namespace: "{{ NAMESPACE }}" - template: configmap-files.yml.j2 - apply: yes - tags: - - configmap - - - name: Deployment - kubernetes.core.k8s: - kubeconfig: ~/.kube/config - namespace: "{{ NAMESPACE }}" - template: deployment.yml.j2 - tags: - - deployment - \ No newline at end of file